Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Nov 2007 01:06:57 +0000 (17:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Nov 2007 01:06:57 +0000 (17:06 -0800)
* maint:
  scripts: do not get confused with HEAD in work tree
  Improve description of git-branch -d and -D in man page.

1  2 
Documentation/git-branch.txt
contrib/examples/git-merge-ours.sh
git-am.sh
git-filter-branch.sh
git-rebase--interactive.sh
git-rebase.sh
git-stash.sh

Simple merge
Simple merge
diff --cc git-am.sh
Simple merge
Simple merge
index bf44b6af58574273df9e7f549136a735f6e549fe,ff38a22edfa60a759c5e68d9e6968d11531e72d1..e9cd6fd999695daa1c5ba49835f53041d4131f3a
                git rev-parse --verify HEAD > /dev/null &&
                git update-index --refresh &&
                git diff-files --quiet &&
-               ! git diff-index --cached --quiet HEAD &&
+               ! git diff-index --cached --quiet HEAD -- &&
 -              . "$DOTEST"/author-script &&
 +              . "$DOTEST"/author-script && {
 +                      test ! -f "$DOTEST"/amend || git reset --soft HEAD^
 +              } &&
                export GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE &&
                git commit -F "$DOTEST"/message -e
  
diff --cc git-rebase.sh
Simple merge
diff --cc git-stash.sh
Simple merge