aboutsummaryrefslogtreecommitdiff
path: root/git-sh-setup.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-01 22:01:28 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-01 22:01:28 -0800
commite5215804ded0102f6d6f3d694374ae5e106fd9c0 (patch)
tree9c030fed625268c19d7f0838b26f742745b36085 /git-sh-setup.sh
parent8e6ae4ad5ff14a6fd958ada867e24f8d248aac58 (diff)
downloadgit-e5215804ded0102f6d6f3d694374ae5e106fd9c0.tar.gz
git-e5215804ded0102f6d6f3d694374ae5e106fd9c0.tar.xz
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>
Diffstat (limited to 'git-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions