table of contents
GIT-ABSORB(1) | git absorb | GIT-ABSORB(1) |
NAME¶
git-absorb - Automatically absorb staged changes into your current branch
SYNOPSIS¶
git absorb [FLAGS] [OPTIONS]
DESCRIPTION¶
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 --and-rebase
(or) $ 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.
FLAGS¶
-r, --and-rebase
-n, --dry-run
-f, --force
-w, --whole-file
-h, --help
-V, --version
-v, --verbose
OPTIONS¶
-b <base>, --base <base>
USAGE¶
[GIT_SEQUENCE_EDITOR]: https://stackoverflow.com/a/29094904 [file an issue]: https://github.com/tummychow/git-absorb/issues/new
CONFIGURATION¶
STACK SIZE¶
When run without --base, 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
GITHUB PROJECT¶
AUTHOR¶
Stephen Jung <tummychow511@gmail.com>
04/06/2023 | git-absorb 0.5.0 |