| commit | 840e23db03bb43148c83f079690aa48eeb33eb81 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Mon, 16 Dec 2013 15:43:12 +0000 (16 09:43 -0600) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Sat, 28 Dec 2013 00:02:03 +0000 (27 18:02 -0600) | ||
| tree | b471a88c77a7927898aeff8903a6f52386d175dd | treesnapshot (tar.gz zip) |
| parent | 95ae63b8c6c0b275f460897c15a44a7df5246dfb | commitdiff |
shears.sh: support fixup! and squash!
One of the most powerful feature added to the already powerful
interactive rebase was to allow workflows where you *add* commits with
the intention to amend ("fix up") other commits in the topic branch at
a later stage, through "git rebase -i --autosquash". Such commits are
added by crafting special-format commit messages, or by using the
convenient --fixup or --squash options of "git commit".
However, with the garden shears, we side-step the original interactive
rebase, therefore we have to re-implement that very convenient
fixup/squash handling.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
One of the most powerful feature added to the already powerful
interactive rebase was to allow workflows where you *add* commits with
the intention to amend ("fix up") other commits in the topic branch at
a later stage, through "git rebase -i --autosquash". Such commits are
added by crafting special-format commit messages, or by using the
convenient --fixup or --squash options of "git commit".
However, with the garden shears, we side-step the original interactive
rebase, therefore we have to re-implement that very convenient
fixup/squash handling.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| share/msysGit/shears.sh | diffblobblamehistory |