git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Tue, 8 Sep 2015 22:34:57 +0000 (15:34 -0700)
committer	Junio C Hamano <redacted>
	Tue, 8 Sep 2015 22:35:05 +0000 (15:35 -0700)
commit	d6a2b05cbb63b1a923e2bb614dedfca83014f870
tree	779a3056080b1e2045ad276559e756c453ddb380	tree \| snapshot
parent	ec371ff6e382d660458eeb8c337d4744985bf308	commit \| diff
parent	aab845424ef4b9a3fd29406e3d722324440e4a00	commit \| 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

RSS Atom

git clone https://git.99rst.org/PROJECT

builtin/am.c	diff1 \|	diff2 \|	blob \| history
t/t4150-am.sh	diff1 \|	diff2 \|	blob \| history