Code

Do not put automatic merge message after signed-off-by line.
authorJunio C Hamano <junkio@cox.net>
Wed, 2 Nov 2005 06:01:28 +0000 (22:01 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 2 Nov 2005 06:01:28 +0000 (22:01 -0800)
commite5215804ded0102f6d6f3d694374ae5e106fd9c0
tree9c030fed625268c19d7f0838b26f742745b36085
parent8e6ae4ad5ff14a6fd958ada867e24f8d248aac58
Do not put automatic merge message after signed-off-by line.

'git-commit -s' after a failed automerge inserted the automerge
message in a wrong place.  The signed-off-by line should come
last.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-commit.sh