My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ec371ff aab8454)
Merge branch 'jc/builtin-am-signoff-regression-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Sep 2015 22:34:57 +0000 (15:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Sep 2015 22:35:05 +0000 (15:35 -0700)
commitd6a2b05cbb63b1a923e2bb614dedfca83014f870
tree779a3056080b1e2045ad276559e756c453ddb380tree | snapshot
parentec371ff6e382d660458eeb8c337d4744985bf308commit | diff
parentaab845424ef4b9a3fd29406e3d722324440e4a00commit | diff
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
builtin/am.c diff1 | diff2 | blob | history
t/t4150-am.sh diff1 | diff2 | blob | history
The core git plumbing