Skip to content
Cameron edited this page Dec 11, 2023 · 6 revisions

For now this is just a dump of my bookmarks, but I plan to try some of these out at some point. I might then blog about what I saw and hopefull will also find some inspiration.

Other lists

Interfaces

Emacs packages

See my similar list of Forge-related bookmarks and my (outdated) list of Emacs packages for Git.

Editor extensions

Many of them are “Inspired by Magit”.

  • neogit A work-in-progress Magit clone for Neovim that is geared toward the Vim philosophy. 2020
  • vimagit Ease your git workflow within vim. 2015
  • edamagit Magit for VSCode, inspired by the awesome original Magit. 2019
  • atomatigit Real git integration for the Atom text editor. 2014
  • GitSavvy Sublime Text plugin providing probably all git has to offer. 2015
  • SublimeGit Git integration for Sublime Text 2 and 3. 2013
  • gitabra A little Magit in neovim. 2021
  • vscode-gitlens GitLens supercharges Git inside VS Code and unlocks untapped knowledge within each repository. 2016

TUI

  • tig An ncurses-based text-mode interface for git. 2006
  • lazygit A simple terminal UI for git commands, written in Go with the gocui library. 2018
  • grv GRV is a terminal based interface for viewing Git repositories. 2017
  • forgit Utility tool for using git interactively. 2017
  • gitui Provides you with the comfort of a git GUI but right in your terminal. 2020
  • hugit The humane Terminal UI for git. 2019
  • git-brunch A git command-line tool to work with branches. 2019
  • git-foresta A text-based git log graph viewer. 2017
  • fac Easy-to-use CUI for fixing git conflicts. 2017
  • gex Cross-platform git workflow improvement tool inspired by Magit. 2022

GUI

  • gitup Work quickly, safely, and without headaches. 2015

CLI

  • bit An experimental modernized git CLI built on top of git that provides happy defaults and other niceties. 2020
  • git-branchless A suite of tools which enhances Git in several ways. It makes Git easier to use, both for novices and for power users. 2020
  • git-town Git Town makes Git more efficient, especially for large teams. 2014
  • twig Your personal Git branch assistant. 2011

By task

Diffing

  • difftastic A structural diff tool that compares files based on their syntax. 2014
  • delta A syntax-highlighting pager for git, diff, and grep output. 2019
  • diff-so-fancy Strives to make your diffs human readable instead of machine readable. 2016
  • klondiff An improved diff algorithm, inspired by the Patience diff algorithm. 2016
  • patdiff An OCaml implementation of Bram Cohen’s patience diff algorithm, with a few extra conveniences for comparing code and config files. 2013
  • autochrome A program for structurally diffing and highlighting clojure source code. 2017
  • (el) diffsitter Creates semantically meaningful diffs that ignore formatting differences like spacing. 2020
  • (el) colisper Comby makes it easy to match code structures. It can output a diff or change the code in-place. 2020

Staging

  • git-crecord Allows users to interactively select changes to commit or stage using a ncurses-based text user interface. 2008

Submodules

  • git-subtrac Collects the entire contents of the entire history of all your submodules (recursively) into a separate git branch. 2019

Multi-Repo Management

Also see list at end of https://myrepos.branchable.com.

  • myrepos A tool to manage all your version control repositories. 2007
  • gita Command-line tool to manage multiple Git repos. 2018

Merging & Rebasing

  • (git) git rerere Fix conflicts only once.
  • git-assembler Perform automatic merge and rebase operations following a simple declarative script. Like “make”, for branches. 2019

Encryption

Analytics

  • hercules Fast, insightful and highly customizable Git history analysis. 2016

Various Commands

  • (git-branchless) git move A drop-in 10x faster replacement for git rebase.
  • (git-branchless) git undo Undo any operation to the commit graph.
  • git-cliff Changelog Generator that follows Conventional Commit. 2020

And now for something completely different

  • gitfs A FUSE file system that fully integrates with git. 2014
  • mergestat-lite A command-line tool for running SQL queries on git repositories and related data sources. 2020