Git Clients

mamediff – terminal editor for staged and unstaged diffs

mamediff is a specialised terminal interface for working with staged and unstaged changes in a Git repository. It is inspired by the way Magit makes individual changes manageable, but concentrates on the common task of preparing a clean set of modifications for a commit.

Its interface separates changes waiting in the working tree from changes already placed in the index. That distinction helps developers review exactly what will enter the next commit, particularly when several unrelated edits have been made to the same file.

Staging is one of the main ways to build coherent Git commits from a working tree containing several edits. mamediff puts the boundary between the index and working tree at the centre of the interface, making it easier to inspect what is ready for recording and what remains outside the next commit.

This is free and open source software.

Key Features

  • Provides a text interface for inspecting differences in the working tree and staging area.
  • Keeps staged and unstaged changes visible as distinct groups.
  • Allows selected changes to be moved from the working tree into the Git index.
  • Supports moving staged changes back into the unstaged state.
  • Can discard selected local modifications after review.
  • Focuses on a diff-oriented workflow rather than replacing the full Git command set.
  • Offers keyboard-driven navigation suitable for users working primarily in a terminal.

Website: github.com/sile/mamediff
Support:
Developer: Takeru Ohta
License: MIT License

mamediff
Click animation for full size

mamediff is written in Rust. Learn Rust with our recommended free books and free tutorials.


Related Software

Git Tools for Diff Review and Repository History
difftasticStructural diff tool that compares files based on their syntax
git-filter-repoQuickly rewrite git repository history
onefetchDisplays information about a local Git repository
git-statsLocal git statistics including GitHub-like contributions calendars
diff-so-fancyAttractive diffs with diff-highlight and more
BFG Repo-CleanerClean unwanted data from Git repository history
git-deltaViewer for git and diff output
gitlogueCinematic Git commit replay tool
git-quick-statsAccess various statistics in a git repository
git-whoCommand-line Git analysis tool
git-standupRecall what you did on the last working day
git-of-theseusAnalyze how a Git repo grows over time
git-sizerCompute various size metrics for a git repository
diffnavGit diff pager based on delta but with a file tree, à la GitHub
critiqueTerminal UI for reviewing git diffs
git-big-pictureVisualization tool for Git repositories
herculesGain advanced insights from Git repository history
keifuTUI that visualizes Git commit graphs
git-fameGit repository collaborators sorted by contributions
needleHighlights GitHub PRs
mergirafGit merge driver
git-historyAnalyze Git history using SQLite
ecTerminal Git mergetool
diffrWord-by-word diff highlighting utility
git-scopeFast TUI dashboard to view the git status of all your repositories
mamediffManages unstaged and staged Git diffs
deadbranchKeep Git repositories tidy
GitTopLightweight desktop client for GitHub notifications
git-heatmapGenerates a customizable heatmap

Read our verdict in the software roundup.


Best Free and Open Source Software LinuxLinks helps you discover the best free and open source software for Linux. Explore our extensive collection of recommended applications, including alternatives to popular proprietary software.

We also publish software reviews, Linux tutorials, hardware reviews, free programming books and articles covering the wider open source community. Browse our Linux resources to discover more.

Know a useful free and open source Linux application we haven't covered? Suggest a program for inclusion.

Has your software been featured on LinuxLinks? Display one of our Featured on LinuxLinks badges on your website or GitHub README.
Subscribe

Please read our Comment Policy before commenting.

Notify of
guest
0 Comments
Oldest
Newest Most Voted