summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Giuseppe Bilotta <giuseppe.bilotta@gmail.com>2017-04-15 16:41:01 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-04-16 21:19:09 -0700
commitb7cc7051f7f1cf9092fbddc828ff4ec249373046 (patch)
tree4be423d3baa87be03fb229b17af4f5a4d0ac1319 /mergetools
parentAlmost ready for 2.11.1 (diff)
downloadtgif-b7cc7051f7f1cf9092fbddc828ff4ec249373046.tar.xz
builtin/am: honor --signoff also when --rebasing
Signoff is handled in parse_mail(), but not in parse_mail_rebasing(), since the latter is only used when git-rebase calls git-am with the --rebasing option, and --signoff is never passed in this case. In order to introduce (in the upcoming commits) support for `git-rebase --signoff`, we must make git-am pay attention to it also in the rebase case. This can be done by moving the conditional addition of the signoff from parse_mail() to the caller am_run(), after either of the parse_mail*() functions were called. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions