https://github.com/bertoldia/git-absorb
Automagically absorb uncommited chages into the right ancestor commit in your working branch.
https://github.com/bertoldia/git-absorb
fixup git workflow
Last synced: 3 months ago
JSON representation
Automagically absorb uncommited chages into the right ancestor commit in your working branch.
- Host: GitHub
- URL: https://github.com/bertoldia/git-absorb
- Owner: bertoldia
- License: gpl-3.0
- Created: 2016-12-18T04:22:48.000Z (over 9 years ago)
- Default Branch: master
- Last Pushed: 2020-08-31T04:26:06.000Z (almost 6 years ago)
- Last Synced: 2024-04-16T15:15:20.667Z (about 2 years ago)
- Topics: fixup, git, workflow
- Language: Go
- Size: 42 KB
- Stars: 3
- Watchers: 2
- Forks: 1
- Open Issues: 1
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
# git-absorb
A git command inspired by the mercurial command of the same name described
[here](https://groups.google.com/forum/#!topic/mozilla.dev.version-control).
The gist of this command is to automagically fixup or squash uncommitted (though
possibly staged) modifications into the right ancestor commit (or a user
specified commit) in a working branch with no user interaction.
The common use case or workflow is for e.g. to modify commits in response to
issues raised during a code review, or when you change your mind about the
content 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 + git
rebase --continue.
## Phase 1
* user must specify target commit into which changes should be absorbed.
* no squash, fixup only.
## Phase 2
* find (if it exists) the single commit that can cleanly (i.e. without merge
conflicts) absorb the outstanding changes. Fail if more than one such commit
exists.
* no squash, fixup only.
## Phase 3
* Add support for --squash.