Add a "Tools" section

content/downloads/_index.html

@@ -38,28 +38,13 @@ <h1>Downloads</h1>
     </div>
   </div>
   <div class="callout" id="more-downloads">
-    <div class="two-column">
-      <div class="column-left">
-        <h2>GUI Clients</h2>
-        <p>
-          Git comes with built-in GUI tools (<strong>git-gui</strong>, <strong>gitk</strong>), but there are several third-party tools for users looking for a platform-specific experience.
-        </p>
-        <p>
-          <strong>
-            <a href="{{< relurl "downloads/guis" >}}">View GUI Clients →</a>
-          </strong>
-        </p>
-      </div>
-      <div class="column-right">
-        <h2>Logos</h2>
-        <p>Various Git logos in PNG (bitmap) and EPS (vector) formats are available for use in online and print projects.</p>
-        <p>
-          <strong>
-            <a href="{{< relurl "downloads/logos" >}}">View Logos →</a>
-          </strong>
-        </p>
-      </div>
-    </div>
+    <h2>Logos</h2>
+    <p>Various Git logos in PNG (bitmap) and EPS (vector) formats are available for use in online and print projects.</p>
+    <p>
+      <strong>
+        <a href="{{< relurl "downloads/logos" >}}">View Logos →</a>
+      </strong>
+      </p>
   </div>
   <h2>Git via Git</h2>
   <p>

content/tools/_index.html

@@ -0,0 +1,50 @@
+---
+section: "tools"
+title: "Git - Tools"
+url: /tools.html
+---
+
+<div id="main">
+
+  <h1> Tools </h1>
+
+  <p>
+    The community has built a huge number of tools to make it easier to use Git.
+    While you can use Git on its own, most Git users use some of these extra tools.
+    There are editor integrations, GUIs, tools for resolving merge conflicts,
+    hosting services, and much more.
+  </p>
+
+  <div class="callout icon">
+    <a href="{{< relurl "tools/command-line">}}">
+      <img alt="Terminal icon" aria-hidden="true" src="{{< relurl "images/icons/fa-terminal.svg">}}" >
+      <h3> Command Line Tools </h3>
+    </a>
+
+    <p>
+      Tools to view and manipulate your Git history
+    </p>
+  </div>
+
+  <div class="callout icon">
+    <a href="{{< relurl "tools/guis">}}">
+      <img alt="Desktop icon" aria-hidden="true" src="{{< relurl "images/icons/fa-desktop.svg">}}" >
+      <h3> GUIs </h3>
+    </a>
+
+    <p>
+      Graphical user interfaces and editor integrations
+    </p>
+  </div>
+
+  <div class="callout icon">
+    <a href="{{< relurl "tools/hosting">}}">
+      <img alt="Cloud icon" aria-hidden="true" src="{{< relurl "images/icons/fa-cloud.svg">}}" >
+      <h3> Hosting </h3>
+    </a>
+
+    <p>
+      Git repository hosting
+    </p>
+  </div>
+</div>

content/tools/command-line.html

@@ -0,0 +1,78 @@
+---
+section: "tools"
+subsection: "command-line"
+title: "Git - Command Line Tools"
+url: /tools/command-line.html
+---
+
+<div id="main">
+  <h1>Command Line Tools</h1>
+
+  <h3>TUIs</h3>
+
+  <ul>
+    <li><strong><a href="https://github.com/jesseduffield/lazygit">lazygit</a></strong>: simple terminal UI for git commands</li>
+    <li><strong><a href="https://jonas.github.io/tig/">tig</a></strong>: ncurses-based text-mode interface for git</li>
+    <li><strong><a href="https://github.com/wfxr/forgit">forgit</a></strong>: A utility tool powered by fzf for using git interactively </li>
+    <li><strong><a href="https://github.com/altsem/gitu">gitu</a></strong>: A TUI Git client inspired by Magit  </li>
+    <li><strong><a href="https://github.com/gitui-org/gitui">gitui</a></strong>: Blazing fast terminal-ui for Git written in Rust</li>
+  </ul>
+
+  <h3>Manage Git history</h3>
+
+  <ul>
+    <li><strong><a href="https://github.com/tummychow/git-absorb">git-absorb</a></strong>: git commit --fixup, but automatic</li>
+    <li><strong><a href="https://github.com/newren/git-filter-repo">git-filter-repo</a></strong>:  Quickly rewrite git repository history (filter-branch replacement)</li>
+    <li><strong><a href="https://github.com/mhagger/git-imerge">git-imerge</a></strong>: Incremental merge for Git </li>
+    <li><strong><a href="https://mergiraf.org/">mergiraf</a></strong>: A syntax-aware git merge driver for a growing collection of programming languages and file formats.</li>
+    <li><strong><a href="https://github.com/arxanas/git-branchless">git-branchless</a></strong>: Branchless workflow for Git</li>
+  </ul>
+
+  <h3>Shell prompt integrations</h3>
+
+  These let you put your current Git branch (and more) in your shell prompt:
+
+  <ul>
+    <li><strong><a href="https://starship.rs/">Starship</a></strong>: The minimal, blazing-fast, and infinitely customizable prompt for any shell!</li>
+    <li><strong><a href="https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh">git-prompt.sh</a></strong>: Bash prompt that comes with Git</li>
+  </ul>
+
+  <h3>Manage large files</h3>
+
+  <ul>
+    <li><strong><a href="https://git-annex.branchable.com/">git-annex</a></strong></li>
+    <li><strong><a href="https://git-lfs.com/">git-lfs</a></strong></li>
+  </ul>
+
+  <h3>Diff tools</h3>
+
+  <ul>
+    <li><strong><a href="https://dandavison.github.io/delta/">delta</a></strong>: A syntax highlighting pager for Git diffs</li>
+    <li><strong><a href="https://github.com/Wilfred/difftastic">difftastic</a></strong>: A structural diff that understands syntax</li>
+    <li><strong><a href="https://github.com/so-fancy/diff-so-fancy">diff-so-fancy</a></strong>: diff-so-fancy strives to make your diffs human readable instead of machine readable</li>
+  </ul>
+
+  <h3>Manage hooks</h3>
+
+  <ul>
+    <li><strong><a href="https://pre-commit.com/">pre-commit</a></strong>:  A framework for managing and maintaining multi-language pre-commit hooks.  </li>
+    <li><strong><a href="https://github.com/evilmartians/lefthook">lefthook</a></strong>: A fast Git hooks manager written in Go </li>
+  </ul>
+
+  <h3>Collections of Git tools</h3>
+
+  <ul>
+    <li><strong><a href="https://github.com/tj/git-extras">git-extras</a></strong>: Git repo summary, repl, changelog population, author commit percentages and more </li>
+    <li><strong><a href="https://github.com/nvie/git-toolbelt">git-toolbelt</a></strong>: A suite of useful Git commands that aid with scripting or every day command line usage</li>
+  </ul>
+
+  <h3>Other</h3>
+
+  <ul>
+    <li><strong><a href="https://mob.sh/">mob.sh</a></strong>: Fast git handover for remote pair/mob programming. </li>
+    <li><strong><a href="https://github.com/awslabs/git-secrets">git-secrets</a></strong>: Prevents you from committing secrets and credentials into git repositories </li>
+    <li><strong><a href="https://commitizen-tools.github.io/commitizen/">Commitizen</a></strong>: Create committing rules for projects, auto bump versions and auto changelog generation</li>
+    <li><strong><a href="https://github.com/git-town/git-town">git-town</a></strong>: Additional Git commands that automate the creation, synchronization, shipping, and cleanup of Git branches</li>
+  </ul>
+
+</div>

content/downloads/guis/_index.html → content/tools/guis/_index.html

@@ -1,9 +1,10 @@
 ---
-section: "downloads"
+section: "tools"
 subsection: "guis"
 title: "Git - GUI Clients"
-url: /downloads/guis.html
+url: /tools/guis.html
 aliases:
+- /downloads/guis.html
 - /downloads/guis/index.html
 - /download/guis/index.html
 - /download/guis.html

content/tools/guis/android.html

@@ -0,0 +1,6 @@
+---
+redirect_to: tools/guis?os=android
+aliases:
+- /download/gui/android
+- /download/guis/android
+---

content/tools/guis/ios.html

@@ -0,0 +1,8 @@
+---
+redirect_to: tools/guis?os=ios
+aliases:
+- /download/gui/ios
+- /download/guis/ios
+---
+
+

content/tools/guis/linux.html

@@ -0,0 +1,7 @@
+---
+redirect_to: tools/guis?os=linux
+aliases:
+- /download/gui/linux
+- /download/guis/linux
+---
+

content/tools/guis/mac.html

@@ -0,0 +1,8 @@
+---
+redirect_to: tools/guis?os=mac
+aliases:
+- /download/gui/mac
+- /download/guis/mac
+---
+
+

content/tools/guis/windows.html

@@ -0,0 +1,8 @@
+---
+redirect_to: tools/guis?os=windows
+aliases:
+- /download/gui/windows
+- /download/guis/windows
+---
+
+

content/tools/hosting.html

@@ -0,0 +1,12 @@
+---
+section: "tools"
+subsection: "hosting"
+title: "Git - Hosting"
+url: /tools/hosting.html
+---
+
+<div id="main">
+  <h1>Git Hosting</h1>
+
+  {{< hosting >}}
+</div>

layouts/partials/sidebar.html

@@ -35,15 +35,27 @@
           </li>
         </ul>
       </li>
+
+      <li>
+        <a href="{{ relURL "tools" }}"{{ if (eq $section "tools") }} class="active"{{ end }}>Tools</a>
+        <ul {{ if (eq $section "tools") }}class="expanded"{{ end }}>
+          <li>
+            <a href="{{ relURL "tools/command-line" }}"{{ if (eq .Params.Subsection "command-line") }} class="active"{{ end }}>Command Line</a>
+          </li>
+          <li>
+            <a href="{{ relURL "tools/guis" }}"{{ if (eq .Params.Subsection "guis") }} class="active"{{ end }}>GUIs</a>
+          </li>
+          <li>
+            <a href="{{ relURL "tools/hosting" }}"{{ if (eq .Params.Subsection "hosting") }} class="active"{{ end }}>Hosting</a>
+          </li>
+        </ul>
+      </li>
       <li>
         <a href="{{ relURL "docs" }}"{{ if or (eq .Params.Subsection "reference") (eq .Params.Subsection "manual") }} class="active"{{ end }}>Reference</a>
       </li>
       <li>
         <a href="{{ relURL "downloads" }}"{{ if (eq $section "downloads") }} class="active"{{ end }}>Downloads</a>
         <ul {{ if (eq $section "downloads") }}class="expanded"{{ end }}>
-          <li>
-            <a href="{{ relURL "downloads/guis" }}"{{ if (eq .Params.Subsection "guis") }} class="active"{{ end }}>GUI Clients</a>
-          </li>
           <li>
             <a href="{{ relURL "downloads/logos" }}"{{ if (eq .Params.Subsection "logos") }} class="active"{{ end }}>Logos</a>
           </li>

layouts/partials/site-root.html

@@ -16,6 +16,13 @@ <h3>Learn</h3>
             <p>Pro Git book, videos, tutorials, and cheat sheet</p>
           </a>
         </li>
+        <li>
+          <a href="{{ relURL "tools" }}">
+            <img src="{{ relURL "images/icons/fa-screwdriver-wrench.svg" }}" width="74" height="74" />
+            <h3>Tools</h3>
+            <p>Command line tools, GUIs, and hosting services</p>
+          </a>
+        </li>
         <li>
           <a href="{{ relURL "docs" }}">
             <img src="{{ relURL "images/icons/fa-book-open.svg" }}" width="74" height="74" />
@@ -27,7 +34,7 @@ <h3>Reference</h3>
           <a href="{{ relURL "downloads" }}">
             <img src="{{ relURL "images/icons/fa-down-long.svg" }}" width="74" height="74" />
             <h3>Downloads</h3>
-            <p>GUI clients and binary releases for all major platforms.</p>
+            <p>Binary releases for all major platforms.</p>
           </a>
         </li>
         <li>
@@ -64,26 +71,3 @@ <h3>Community</h3>
 </section>
 </div>
 
-<section id="companies-projects">
-  <h3 class="text-center">Products providing Git hosting</h3>
-  <ul>
-    {{ $m := slice
-    (dict "name" "gitlab" "url" "https://gitlab.com")
-    (dict "name" "github" "url" "https://github.com")
-    (dict "name" "forgejo" "url" "https://forgejo.org")
-    (dict "name" "codeberg" "url" "https://codeberg.org")
-    (dict "name" "sourcehut" "url" "https://sourcehut.org")
-    (dict "name" "gitea" "url" "https://gitea.com")
-    (dict "name" "tangled" "url" "https://tangled.org")
-    (dict "name" "radicle" "url" "https://radicle.xyz")
-    (dict "name" "gerrit" "url" "https://www.gerritcodereview.com")
-    (dict "name" "azure-repos" "url" "https://azure.microsoft.com/en-us/products/devops/repos/")
-    }}
-    {{ range shuffle $m }}
-    <li><a href="{{ .url }}">{{ partial "company-svg" (printf "company-project-logos/%s" .name) }}</a></li>
-    {{ end }}
-  </ul>
-  <script type="text/javascript">
-    document.getElementById("companies-projects").style.setProperty("--seed", Math.floor(Math.random() * 1000));
-  </script>
-</section>

layouts/shortcodes/hosting.html

@@ -0,0 +1,22 @@
+<section id="companies-projects">
+  <ul>
+    {{ $m := slice
+    (dict "name" "gitlab" "url" "https://gitlab.com")
+    (dict "name" "github" "url" "https://github.com")
+    (dict "name" "forgejo" "url" "https://forgejo.org")
+    (dict "name" "codeberg" "url" "https://codeberg.org")
+    (dict "name" "sourcehut" "url" "https://sourcehut.org")
+    (dict "name" "gitea" "url" "https://gitea.com")
+    (dict "name" "tangled" "url" "https://tangled.org")
+    (dict "name" "radicle" "url" "https://radicle.xyz")
+    (dict "name" "gerrit" "url" "https://www.gerritcodereview.com")
+    (dict "name" "azure-repos" "url" "https://azure.microsoft.com/en-us/products/devops/repos/")
+    }}
+    {{ range shuffle $m }}
+    <li><a href="{{ .url }}">{{ partial "company-svg" (printf "company-project-logos/%s" .name) }}</a></li>
+    {{ end }}
+  </ul>
+  <script type="text/javascript">
+    document.getElementById("companies-projects").style.setProperty("--seed", Math.floor(Math.random() * 1000));
+  </script>
+</section>