summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorAndy Parkins <andyparkins@gmail.com>2007-04-26 22:36:24 +0100
committerJunio C Hamano <junkio@cox.net>2007-04-26 20:59:49 -0700
commit024e5b31af6f06d39542ab1a44de358d7734388b (patch)
tree77847ad5d6b88701f40d583f75173c39ca33d261 /git-merge-resolve.sh
parent8e404f82abdfd912ad43c6fae7c218ff75a5d122 (diff)
downloadgit-024e5b31af6f06d39542ab1a44de358d7734388b.tar.gz
post-receive-email example hook: detect rewind-only updates and output sensible message
Sometimes a non-fast-forward update doesn't add new commits, it merely removes old commits. This patch adds support for detecting that and outputting a more correct message. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions