Mergiraf
Official · Mergiraf
46
Syntax-aware Git merge driver that resolves conflicts structurally instead of treating source files as plain text.
$brew install mergiraf
Alternatives
lazygit
Simple terminal UI for git. Stage, commit, rebase, cherry-pick — all with keyboard shortcuts.
Gitea CLI
Self-hosted Git service — lightweight GitHub/GitLab alternative with tea CLI
GitHub CLI
Official
Official GitHub CLI. PRs, issues, repos, actions, codespaces — all from the terminal.
delta
Syntax-highlighting pager for git, diff, grep, and blame output
difftastic
Syntax-aware diff tool that compares structure, not just lines, for clearer code review output.
gitui
Fast terminal UI for Git with status, staging, logs, branches, and commit workflows in Rust.