diff options
author | Charvi Mendiratta <charvi077@gmail.com> | 2021-01-29 23:50:49 +0530 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-29 15:21:56 -0800 |
commit | bae5b4aea523388faedd3b850c862fe45198c6b2 (patch) | |
tree | 4a8ce59e854fa06df5a17c5f69f3493643673b10 /t/t2017-checkout-orphan.sh | |
parent | t3437: test script for fixup [-C|-c] options in interactive rebase (diff) | |
download | tgif-bae5b4aea523388faedd3b850c862fe45198c6b2.tar.xz |
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>
Diffstat (limited to 't/t2017-checkout-orphan.sh')
0 files changed, 0 insertions, 0 deletions