mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  scripts: do not get confused with HEAD in work tree
  Improve description of git-branch -d and -D in man page.
This commit is contained in:
Junio C Hamano
2007-11-28 17:06:57 -08:00
parent b3a4f8586b 38762c47d6
commit d25430c5f8
7 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/examples/git-merge-ours.sh
View File

@ -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