summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-08-22 10:29:07 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-22 10:29:07 -0700
commit5c3895dfbd24a5ea23a8899ac40730359a6b2613 (patch)
treee3f3a7813ee6e63eafe9f320de8eb288c230f180 /builtin/reset.c
parentMerge branch 'rs/t3700-clean-leftover' (diff)
parentam: fix signoff when other trailers are present (diff)
downloadtgif-5c3895dfbd24a5ea23a8899ac40730359a6b2613.tar.xz
Merge branch 'pw/am-signoff'
"git am -s" has been taught that some input may end with a trailer block that is not Signed-off-by: and it should refrain from adding an extra blank line before adding a new sign-off in such a case. * pw/am-signoff: am: fix signoff when other trailers are present
Diffstat (limited to 'builtin/reset.c')
0 files changed, 0 insertions, 0 deletions