- Notifications
You must be signed in to change notification settings - Fork1
Automagically absorb uncommited chages into the right ancestor commit in your working branch.
License
bertoldia/git-absorb
Folders and files
| Name | Name | Last commit message | Last commit date | |
|---|---|---|---|---|
Repository files navigation
A git command inspired by the mercurial command of the same name describedhere.
The gist of this command is to automagically fixup or squash uncommitted (thoughpossibly staged) modifications into the right ancestor commit (or a userspecified commit) in a working branch with no user interaction.
The common use case or workflow is for e.g. to modify commits in response toissues raised during a code review, or when you change your mind about thecontent of existing commits in your working branch.
An alternate workflow for the above use-cases is to do an interactive rebase,mark the relevant commits with (m)odify, make changes, then do git add + gitrebase --continue.
- user must specify target commit into which changes should be absorbed.
- no squash, fixup only.
- find (if it exists) the single commit that can cleanly (i.e. without mergeconflicts) absorb the outstanding changes. Fail if more than one such commitexists.
- no squash, fixup only.
- Add support for --squash.