summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 51901e9)
raw | patch | inline | side by side (parent: 51901e9)
author | Junio C Hamano <junkio@cox.net> | |
Mon, 27 Nov 2006 06:19:42 +0000 (22:19 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Mon, 27 Nov 2006 06:19:42 +0000 (22:19 -0800) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge.sh | patch | blob | history |
diff --git a/git-merge.sh b/git-merge.sh
index 5fa8b0d577879e00c1959098250a9b1fd559fdc8..75af10d3e431edf6f7447ab4a3dfcf84e994a2ef 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
shift
head_arg="$1"
shift
-elif ! git-rev-parse --verify HEAD 2>/dev/null
+elif ! git-rev-parse --verify HEAD >/dev/null 2>&1
then
# If the merged head is a valid one there is no reason to
# forbid "git merge" into a branch yet to be born. We do