summaryrefslogtreecommitdiff
path: root/mailmap.h
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2021-01-29 23:50:44 +0530
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-01-29 15:21:56 -0800
commit7cdb9682545d7865e832d092f900a8037898e907 (patch)
treeb4436608496d09da66d370606d212563659362f2 /mailmap.h
parentsequencer: factor out code to append squash message (diff)
downloadtgif-7cdb9682545d7865e832d092f900a8037898e907.tar.xz
rebase -i: comment out squash!/fixup! subjects from squash message
When squashing commit messages the squash!/fixup! subjects are not of interest so comment them out to stop them becoming part of the final message. This change breaks a bunch of --autosquash tests which rely on the "squash! <subject>" line appearing in the final commit message. This is addressed by adding a second line to the commit message of the "squash! ..." commits and testing for that. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Charvi Mendiratta <charvi077@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mailmap.h')
0 files changed, 0 insertions, 0 deletions