Re: [SCRIPT/RFC 0/3] git-commit --onto-parent (three-way merge,noworking tree file changes)
- From
Alexei Lozovsky <a.lozovsky@gmail.com>
- Date
- Dec 11, 2017, 01:00 UTC
- Message-ID
- <EC2DA0F0-7DA2-412B-AB9E-5F8B0CD12F57@gmail.com>
- In-Reply-To
- <82da4317-6b50-f60d-6d8f-50fc47579c56@talktalk.net>
On Dec 10, 2017, at 14:22, Phillip Wood wrote:
Show 9 quoted lines
> > 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.