projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-svn: add 'log' command, a facsimile of basic `svn log'
[git.git]
/
git-merge-ours.sh
diff --git
a/git-merge-ours.sh
b/git-merge-ours.sh
index
a64704f
..
4f3d053
100755
(executable)
--- a/
git-merge-ours.sh
+++ b/
git-merge-ours.sh
@@
-4,4
+4,11
@@
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#
+
+# We need to exit with 2 if the index does not match our HEAD tree,
+# because the current index is what we will be committing as the
+# merge result.
+
+test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2
+
exit 0
exit 0