tree 779a3056080b1e2045ad276559e756c453ddb380
parent ec371ff6e382d660458eeb8c337d4744985bf308
parent aab845424ef4b9a3fd29406e3d722324440e4a00
author Junio C Hamano <gitster@pobox.com> 1441751697 -0700
committer Junio C Hamano <gitster@pobox.com> 1441751705 -0700

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