Git Tools

lazygit81.1k★

Lazygit puts a visual interface on top of git right in your terminal. You see your branches, commits, staged files, and diffs all at once, and you navigate with keyboard shortcuts instead of typing commands. MIT license. This is one of the most popular developer tools on GitHub, period. It doesn't replace git; it makes git usable for humans. Interactive rebase becomes drag-and-drop. Cherry-picking is a keypress. Resolving merge conflicts shows you both sides with a visual diff. Fully free. No paid tier, no account, no telemetry. Install it with your package manager and run it. Works on Mac, Linux, and Windows. The catch: there's a learning curve to lazygit's own keybindings; you're trading git command memorization for lazygit shortcut memorization. And it's a TUI (terminal user interface), not a GUI; if you want a graphical git client with mouse support, look at GitKraken or Fork. But for developers who live in the terminal, this is the git interface that should have existed from day one.

delta31.7k★

Delta makes your diffs actually readable. Instead of squinting at raw diff output trying to figure out what changed, you get syntax highlighting, line numbers, and side-by-side views that look like they belong in a real code editor. It's a drop-in replacement for git's default pager. Install it, add three lines to your .gitconfig, and every git diff, git log, and git show instantly looks better. Works with bat themes if you already use bat for file viewing. What sells it: the diff-so-fancy style output with proper language-aware syntax highlighting. It understands 200+ languages and the highlighting actually follows the grammar, not just keyword matching. Side-by-side mode is clean. Merge conflict display is useful. The catch: it's a visual tool with zero cloud component, so there's nothing to pay for and nothing to manage. Pure upside. The only friction is initial config. You need to set it as your pager in .gitconfig and pick a theme. If you're happy with your current diff setup, this won't change your life. But if you've ever wished terminal diffs looked like GitHub diffs, this is it.

OneDev15.1k★

OneDev bundles Git hosting, CI/CD pipelines, issue tracking, Kanban boards, and a package registry into a single Java application you run on your own server. One install, one database, no separate services to wire together. Self-hosting is free under MIT. You get unlimited repos, users, and CI/CD minutes. The CI/CD runs Docker-based pipelines with caching, parallel jobs, and build promotion. Issue tracking includes custom fields, boards, and time tracking. The package registry supports Maven, npm, PyPI, NuGet, and more. The paid tier is enterprise support and features: SAML/LDAP SSO, audit logging, high availability clustering. Starts at $15/user/month. The catch: it's Java, which means it needs more RAM than you'd expect. Plan for 2GB minimum, 4GB+ for active use. The UI is functional but not as polished as GitLab or Gitea. And the community is smaller, so when you hit an edge case, you're reading source code, not Stack Overflow. If you just need Git hosting without the CI/CD, Gitea is lighter.

sem3.3k★

' sem fixes that. Instead of line-by-line diffs, it gives you entity-level diffs: which functions changed, which classes were renamed, which dependencies shifted. Consider it version control that understands code structure, not just text. It supports 21 languages, runs as a CLI, and adds blame, graph, and impact analysis on top of the structural diff. The impact analysis is the real selling point: change a function and sem tells you what else in your codebase is affected. Written in Rust, Apache 2.0, fully free. No paid tier, no cloud, no account. Install the CLI and go. The catch: nascent stage. The concept is excellent but the ecosystem is tiny. If your language isn't in the 21 supported, you're out of luck. And at this star count, expect rough edges and sparse docs.

josh1.9k★

Josh solves a specific monorepo headache: working with one folder of a giant repository as if it were its own small repo, full Git history and all, without cloning the entire thing. If your company keeps everything in one massive monorepo but a team only cares about one corner of it, Josh projects that corner out as a standalone repo they can clone, commit to, and push back. MIT licensed and free. The core piece is josh-proxy, an HTTP and SSH Git proxy that transforms history on the fly and shares a cache across everyone hitting it. There is also a local CLI for the same projections, reusable filter and workspace configs you version like code, and a GraphQL API so build systems can query repo state without checking anything out. It is written in Rust, which shows in how it handles large histories. This is infrastructure for organizations that have already committed to a monorepo and hit the wall: slow clones, access boundaries, CI that rebuilds the world. Solo developers and small teams almost certainly do not need it. The teams that do tend to know exactly why. Standing up josh-proxy and writing good filters is real work, not a weekend setup. The catch is that Josh is powerful precisely because it sits between developers and Git, which means it is one more piece of infrastructure to run, monitor, and keep available. When the proxy is down, the projections are down. Treat it like the production service it becomes.

git-machete1.1k★

Git-machete keeps track of which branch depends on which and automates the rebasing. You define your branch tree, and it handles the cascading rebases that would otherwise take 15 minutes of manual work. Fully free under MIT. Install via pip or Homebrew. No paid tier, no hosted version. It adds commands to Git: `git machete discover` auto-detects your branch structure, `git machete traverse` walks through branches and rebases them in order, and `git machete status` shows the tree visually. The catch: this is a power-user tool. If you work on one branch at a time and merge to main, you don't need it. The value only kicks in with stacked PRs or complex branch hierarchies. And the learning curve is real; you need to understand Git's rebase model well enough to know what git-machete is doing on your behalf. The has_pricing_page flag is misleading; the PyPI link isn't a pricing page, the tool is free.