Skip to content

Commit e2eb96f

Browse files
jvnsjvns
authored
Add a "Tools" section (#2092)
This adds the "Tools" page discussed in #2070. I added tools to the "command line tools" page pretty arbitrarily -- I just added a tools that I've heard of before or used, with the idea that folks can submit PRs with other tools that they've used. I tried to stick to the ways the command line tools describe themselves and avoided editorializing. I also moved "Hosting" into the Tools section from the homepage (from #2063), since hosts feel like tools to me, especially since some of them can be self-hosted. In the future it might be good to point out specifically which repository hosting tools can be used to self-host, but I just moved the existing page for now. Fixes #2070 and #2063
2 parents a60db66 + c13d5f4 commit e2eb96f

22 files changed

+236
-83
lines changed

‎content/downloads/_index.html‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,13 @@ <h1>Downloads</h1>
3838
</div>
3939
</div>
4040
<div class="callout" id="more-downloads">
41-
<div class="two-column">
42-
<div class="column-left">
43-
<h2>GUI Clients</h2>
44-
<p>
45-
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.
46-
</p>
47-
<p>
48-
<strong>
49-
<a href="{{< relurl "downloads/guis" >}}">View GUI Clients →</a>
50-
</strong>
51-
</p>
52-
</div>
53-
<div class="column-right">
54-
<h2>Logos</h2>
55-
<p>Various Git logos in PNG (bitmap) and EPS (vector) formats are available for use in online and print projects.</p>
56-
<p>
57-
<strong>
58-
<a href="{{< relurl "downloads/logos" >}}">View Logos →</a>
59-
</strong>
60-
</p>
61-
</div>
62-
</div>
41+
<h2>Logos</h2>
42+
<p>Various Git logos in PNG (bitmap) and EPS (vector) formats are available for use in online and print projects.</p>
43+
<p>
44+
<strong>
45+
<a href="{{< relurl "downloads/logos" >}}">View Logos →</a>
46+
</strong>
47+
</p>
6348
</div>
6449
<h2>Git via Git</h2>
6550
<p>

‎content/downloads/guis/android.html‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎content/downloads/guis/ios.html‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎content/downloads/guis/linux.html‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎content/downloads/guis/mac.html‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎content/downloads/guis/windows.html‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎content/tools/_index.html‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
section: "tools"
3+
title: "Git - Tools"
4+
url: /tools.html
5+
---
6+
7+
<div id="main">
8+
9+
<h1> Tools </h1>
10+
11+
<p>
12+
The community has built a huge number of tools to make it easier to use Git.
13+
While you can use Git on its own, most Git users use some of these extra tools.
14+
There are editor integrations, GUIs, tools for resolving merge conflicts,
15+
hosting services, and much more.
16+
</p>
17+
18+
<div class="callout icon">
19+
<a href="{{< relurl "tools/command-line">}}">
20+
<img alt="Terminal icon" aria-hidden="true" src="{{< relurl "images/icons/fa-terminal.svg">}}" >
21+
<h3> Command Line Tools </h3>
22+
</a>
23+
24+
<p>
25+
Tools to view and manipulate your Git history
26+
</p>
27+
</div>
28+
29+
<div class="callout icon">
30+
<a href="{{< relurl "tools/guis">}}">
31+
<img alt="Desktop icon" aria-hidden="true" src="{{< relurl "images/icons/fa-desktop.svg">}}" >
32+
<h3> GUIs </h3>
33+
</a>
34+
35+
<p>
36+
Graphical user interfaces and editor integrations
37+
</p>
38+
</div>
39+
40+
<div class="callout icon">
41+
<a href="{{< relurl "tools/hosting">}}">
42+
<img alt="Cloud icon" aria-hidden="true" src="{{< relurl "images/icons/fa-cloud.svg">}}" >
43+
<h3> Hosting </h3>
44+
</a>
45+
46+
<p>
47+
Git repository hosting
48+
</p>
49+
</div>
50+
</div>

‎content/tools/command-line.html‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
---
2+
section: "tools"
3+
subsection: "command-line"
4+
title: "Git - Command Line Tools"
5+
url: /tools/command-line.html
6+
---
7+
8+
<div id="main">
9+
<h1>Command Line Tools</h1>
10+
11+
<h3>TUIs</h3>
12+
13+
<ul>
14+
<li><strong><a href="https://github.com/jesseduffield/lazygit">lazygit</a></strong>: simple terminal UI for git commands</li>
15+
<li><strong><a href="https://jonas.github.io/tig/">tig</a></strong>: ncurses-based text-mode interface for git</li>
16+
<li><strong><a href="https://github.com/wfxr/forgit">forgit</a></strong>: A utility tool powered by fzf for using git interactively </li>
17+
<li><strong><a href="https://github.com/altsem/gitu">gitu</a></strong>: A TUI Git client inspired by Magit </li>
18+
<li><strong><a href="https://github.com/gitui-org/gitui">gitui</a></strong>: Blazing fast terminal-ui for Git written in Rust</li>
19+
</ul>
20+
21+
<h3>Manage Git history</h3>
22+
23+
<ul>
24+
<li><strong><a href="https://github.com/tummychow/git-absorb">git-absorb</a></strong>: git commit --fixup, but automatic</li>
25+
<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>
26+
<li><strong><a href="https://github.com/mhagger/git-imerge">git-imerge</a></strong>: Incremental merge for Git </li>
27+
<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>
28+
<li><strong><a href="https://github.com/arxanas/git-branchless">git-branchless</a></strong>: Branchless workflow for Git</li>
29+
</ul>
30+
31+
<h3>Shell prompt integrations</h3>
32+
33+
These let you put your current Git branch (and more) in your shell prompt:
34+
35+
<ul>
36+
<li><strong><a href="https://starship.rs/">Starship</a></strong>: The minimal, blazing-fast, and infinitely customizable prompt for any shell!</li>
37+
<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>
38+
</ul>
39+
40+
<h3>Manage large files</h3>
41+
42+
<ul>
43+
<li><strong><a href="https://git-annex.branchable.com/">git-annex</a></strong></li>
44+
<li><strong><a href="https://git-lfs.com/">git-lfs</a></strong></li>
45+
</ul>
46+
47+
<h3>Diff tools</h3>
48+
49+
<ul>
50+
<li><strong><a href="https://dandavison.github.io/delta/">delta</a></strong>: A syntax highlighting pager for Git diffs</li>
51+
<li><strong><a href="https://github.com/Wilfred/difftastic">difftastic</a></strong>: A structural diff that understands syntax</li>
52+
<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>
53+
</ul>
54+
55+
<h3>Manage hooks</h3>
56+
57+
<ul>
58+
<li><strong><a href="https://pre-commit.com/">pre-commit</a></strong>: A framework for managing and maintaining multi-language pre-commit hooks. </li>
59+
<li><strong><a href="https://github.com/evilmartians/lefthook">lefthook</a></strong>: A fast Git hooks manager written in Go </li>
60+
</ul>
61+
62+
<h3>Collections of Git tools</h3>
63+
64+
<ul>
65+
<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>
66+
<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>
67+
</ul>
68+
69+
<h3>Other</h3>
70+
71+
<ul>
72+
<li><strong><a href="https://mob.sh/">mob.sh</a></strong>: Fast git handover for remote pair/mob programming. </li>
73+
<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>
74+
<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>
75+
<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>
76+
</ul>
77+
78+
</div>

‎content/downloads/guis/_index.html‎ renamed to ‎content/tools/guis/_index.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
---
2-
section: "downloads"
2+
section: "tools"
33
subsection: "guis"
44
title: "Git - GUI Clients"
5-
url: /downloads/guis.html
5+
url: /tools/guis.html
66
aliases:
7+
- /downloads/guis.html
78
- /downloads/guis/index.html
89
- /download/guis/index.html
910
- /download/guis.html

‎content/tools/guis/android.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
redirect_to: tools/guis?os=android
3+
aliases:
4+
- /download/gui/android
5+
- /download/guis/android
6+
---

0 commit comments

Comments
 (0)