You have a feature branch with a few commits. Your teammate reviewed the branch and pointed out a few bugs. You have fixes for the bugs, but you don't want to shove them all into an opaque commit that says
fixes, because you believe in atomic commits. Instead of manually finding commit SHAs for
git commit --fixup, or running a manual interactive rebase, do this:
git add $FILES_YOU_FIXED git absorb git rebase -i --autosquash master
git absorb will automatically identify which commits are safe to modify, and which indexed changes belong to each of those commits. It will then write
fixup! commits for each of those changes. You can check its output manually if you don't trust it, and then fold the fixups into your feature branch with git's built-in autosquash functionality.
You will need the following:
cargo install git-absorb. Make sure that
$CARGO_HOME/bin is on your
$PATH so that git can find the command. (
$CARGO_HOME defaults to
git absorb does not use the system libgit2. This means you do not need to have libgit2 installed to build or run it. However, this does mean you have to be able to build libgit2. (Due to recent changes in the git2 crate, CMake is no longer needed to build it.)
There is also a Homebrew option.
brew install git-absorb
git addany changes that you want to absorb. By design,
git absorbwill only consider content in the git index.
git absorb. This will create a sequence of commits on
HEAD. Each commit will have a
fixup!message indicating the message (if unique) or SHA of the commit it should be squashed into.
- If you are satisfied with the output,
git rebase -i --autosquashto squash the
fixup!commits into their predecessors. You can set the
GIT_SEQUENCE_EDITORenvironment variable if you don't need to edit the rebase TODO file.
- If you are not satisfied (or if something bad happened),
git reset --softto the pre-absorption commit to recover your old state. (You can find the commit in question with
git reflog.) And if you think
git absorbis at fault, please file an issue.
git-absorb will only search for candidate commits to fixup within a certain range (by default 10). If you get an error like this:
WARN stack limit reached, limit: 10
edit your local or global
.gitconfig and add the following section
[absorb] maxStack=50 # Or any other reasonable value for your project
- implement force flag
- implement remote default branch check
- add flag to automatically run rebase after successful absorption
- add smaller force flags to disable individual safety checks
- stop using
failure::err_msgand ensure all error output is actionable by the user
- slightly more log output in the success case
- more tests (esp main module and integration tests)
- windows support and appveyor
- document stack and commute details
- more commutation cases (esp copy/rename detection)
- don't load all hunks in memory simultaneously because they could be huge
- implement some kind of index locking to protect against concurrent modifications