Git Tools

lazygit83.7k★

Lazygit puts a keyboard-driven interface on git inside your terminal: branches, commits, changed files and diffs on one screen, with single keys for what git makes painful. Stage a single line. Squash, fixup, drop or reorder commits without hand-editing a rebase TODO file. Amend an old commit, cherry-pick, bisect, undo. It's MIT licensed and free, with no paid tier and no account. Nothing to host. Install it with Homebrew, apt, Scoop, winget or most other package managers, then run lazygit in a repo. It works on macOS, Linux and Windows, and the mouse works too. Merge conflicts get their own view where you pick a hunk, or both, then move to the next. The October 0.66 release moved line staging into the main diff view and added push and pull for stacked branches. Solo, small teams, big teams: free, and the rollout is telling people it exists. The catch: you trade memorized git commands for memorized lazygit keys, and when a keypress does something surprising you still need enough git to recover. Undo only covers commits and branches, not your working tree or stash. Want a mouse-first desktop app? GitKraken, Fork or Tower. Another terminal option? GitUI or tig.

delta32.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.3k★

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.

worktrunk11.7k★

Worktrunk makes Git worktrees as easy as branches. A worktree is an extra checkout of your repo in its own folder, so several AI coding agents can work at once without trampling each other. Plain git worktree makes you type the branch name three times; wt switch -c -x claude feat creates both and launches Claude Code in one line. It's a free Rust CLI, dual-licensed MIT or Apache 2.0. Nothing to host. Install it (Homebrew, Cargo, winget and others), then run wt config shell install so it can change directories. On Windows, wt collides with Windows Terminal, so winget also installs it as git-wt. It has outgrown a wrapper: lifecycle hooks, one-command squash and merge, LLM commit messages through whatever CLI you already use, CI status in wt list --full, and copy-on-write sharing of node_modules or target/ on APFS, btrfs and XFS. No paid tier: solo, small teams and larger teams all run it free. The catch: it's pre-1.0 and churns. The October release listed 13 breaking changes across hooks, templates and config paths, so pin a version. It's essentially one maintainer. Project hooks in a repo's .config/wt.toml run shell commands; worktrunk asks first, but --yes skips the prompt.

sem3.4k★

Git diffs tell you which lines changed, not which functions did. 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.

josh2.0k★

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.

useful-forks.github.io1.3k★

Useful Forks answers the question GitHub's fork list can't: which of these hundreds of forks actually did anything? Paste a repo and it lists the forks ranked by stars, drops the ones that never pushed a commit, digs into forks of forks, and exports CSV. There's a website, Chrome and Firefox extensions that add a button on GitHub, and a bookmarklet. MIT. It runs entirely in your browser against GitHub's API, with no backend. Small repos need no token; big ones will hit GitHub's rate limit, and then you add a token, which stays in your browser's local storage. Give it one with no scopes. Anyone whose favorite project went quiet and wants the fork that kept going: this is the tool. Maintainers can use it to find patches worth pulling back upstream. The catch: the site still loads an old Google Analytics tag that logs which repos you search. Google shut down that version of Analytics, so it's probably collecting nothing, but it's still there.

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.

git-ai1.0k★

gitai is a Git server rebuilt for fleets of coding agents: an open source take on Scion, the internal version control system Anthropic described in October 2026. Agents fetch only the files they need, history and blame run on the server, and changes land through a compare-and-swap that batches pushes to the same branch instead of a merge queue. MIT licensed and free. This is infrastructure, not an app. It's a fork of Gitaly, GitLab's Git server, and you build it from source with Go 1.26, a C toolchain, Meson and Ninja. No prebuilt binaries yet. State lives in SQLite or Postgres with packs in S3, GCS or Azure, and there's no web UI, issues or CI. In the author's own benchmark, 50 agents hammering one branch landed about twice as many changes as the classic path. Solo and small teams: skip it, GitHub plus worktrees is fine. Larger teams running dozens of agents on one repo: worth a test cluster. The catch: one developer released it in mid-October 2026, interfaces may change before 1.0, and pack garbage collection isn't built yet. Don't confuse it with Git AI, a separate project that tracks AI-written lines in your commits.