summaryrefslogtreecommitdiff
path: root/contrib/examples
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-29 01:06:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-29 01:06:57 (GMT)
commitd25430c5f88c7e7b4ce24c1b08e409f4345c4eb9 (patch)
tree88de4825ce11d7eaed4719b0b9db1d0e649f9107 /contrib/examples
parentb3a4f8586b4ffa6c896cf0afb2ea49d64faf81ad (diff)
parent38762c47d6442dc0ce0f45533f9151877c485337 (diff)
downloadgit-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.zip
git-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.tar.gz
git-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.tar.bz2
Merge branch 'maint'
* maint: scripts: do not get confused with HEAD in work tree Improve description of git-branch -d and -D in man page.
Diffstat (limited to 'contrib/examples')
-rwxr-xr-xcontrib/examples/git-merge-ours.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-merge-ours.sh b/contrib/examples/git-merge-ours.sh
index c81a790..29dba4b 100755
--- a/contrib/examples/git-merge-ours.sh
+++ b/contrib/examples/git-merge-ours.sh
@@ -9,6 +9,6 @@
# because the current index is what we will be committing as the
# merge result.
-git diff-index --quiet --cached HEAD || exit 2
+git diff-index --quiet --cached HEAD -- || exit 2
exit 0