rebase --autosquash does not handle fixup! of fixup!
From: Andrew Pimlott <hidden>
Date: 2016-06-15 22:57:41
From: Andrew Pimlott <hidden>
Date: 2016-06-15 22:57:41
git rebase -i --autosquash does not handle a fixup! of a fixup!, such as
the history:
aaaaaaa fix nasty bug
...
bbbbbbb fixup! fix nasty bug
...
ccccccc fixup! fixup! fix nasty bug
--autosquash produces:
pick aaaaaaa fix nasty bug
fixup bbbbbbb fixup! fix nasty bug
...
pick ccccccc fixup! fixup! fix nasty bug
This defeats the workflow I was hoping to use:
git commit -m 'fix nasty bug'
...
git commit --fixup :/nasty
...
git commit --fixup :/nasty
The second :/nasty resolves to the previous fixup, not the initial
commit. I could have made the regular expression more precise, but this
would be a hassle.
Would a change to support fixup! fixup! be considered?
Andrew
(Please Cc: me on replies.)