]> git.ipfire.org Git - thirdparty/git.git/commit
rebase -i: teach --autosquash to work with amend!
authorCharvi Mendiratta <charvi077@gmail.com>
Fri, 29 Jan 2021 18:20:49 +0000 (23:50 +0530)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Jan 2021 23:21:56 +0000 (15:21 -0800)
commitbae5b4aea523388faedd3b850c862fe45198c6b2
tree4a8ce59e854fa06df5a17c5f69f3493643673b10
parent1d410cd8c25978c1591a7d35c9077745146c6129
rebase -i: teach --autosquash to work with amend!

If the commit subject starts with "amend!" then rearrange it like a
"fixup!" commit and replace `pick` command with `fixup -C` command,
which is used to fixup up the content if any and replaces the original
commit message with amend! commit's message.

Original-patch-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c
t/t3437-rebase-fixup-options.sh