diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-28 17:06:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-28 17:06:57 -0800 |
| commit | d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9 (patch) | |
| tree | 88de4825ce11d7eaed4719b0b9db1d0e649f9107 /contrib/examples/git-merge-ours.sh | |
| parent | bash completion: add diff options (diff) | |
| parent | scripts: do not get confused with HEAD in work tree (diff) | |
| download | tgif-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.tar.xz | |
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/git-merge-ours.sh')
| -rwxr-xr-x | contrib/examples/git-merge-ours.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-merge-ours.sh b/contrib/examples/git-merge-ours.sh index c81a790aa6..29dba4ba3a 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 |