summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-08 15:34:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-08 15:35:05 -0700
commitd6a2b05cbb63b1a923e2bb614dedfca83014f870 (patch)
tree779a3056080b1e2045ad276559e756c453ddb380 /GIT-VERSION-GEN
parentSync with maint (diff)
parentam: match --signoff to the original scripted version (diff)
downloadtgif-d6a2b05cbb63b1a923e2bb614dedfca83014f870.tar.xz
Merge branch 'jc/builtin-am-signoff-regression-fix'
Recent "git am" had regression when adding a Signed-off-by line with its "-s" option by an unintended tightening of how an existing trailer block is detected. * jc/builtin-am-signoff-regression-fix: am: match --signoff to the original scripted version
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions