On Dec 10, 2017, at 14:22, Phillip Wood wrote: > > I've found conflicts arising from moving fixups can be quite common, so > these days I tend to edit the commit to be fixed up directly. I have a > script git-amend that does something like > > target=$(git rev-parse --verify "$1") && GIT_SEQUENCE_EDITOR="sed -i > s/^pick $target/edit $target/" rebase -ik $target^ > > so I can just type 'git amend <commit>' to make this easier
Hm... I just realized that using "edit" command during interactive rebase should probably be the same as the strategy with a temporary branch and rebase --onto I described earlier. I should fix my habits, I guess.
