From: Junio C Hamano <junkio@cox.net>
Date: Sat, 24 Sep 2005 01:46:34 +0000 (-0700)
Subject: Merge 'fixes' branch.
X-Git-Tag: v0.99.8~74
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/348c4c66dacb1810a9bcd592e72f98a465233488?ds=inline;hp=-c

Merge 'fixes' branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

348c4c66dacb1810a9bcd592e72f98a465233488
diff --combined .gitignore
index e8ae8c352b,92deccb291..cc70c6c3da
--- a/.gitignore
+++ b/.gitignore
@@@ -20,9 -20,11 +20,9 @@@ git-cvsimpor
  git-daemon
  git-diff
  git-diff-files
 -git-diff-helper
  git-diff-index
  git-diff-stages
  git-diff-tree
 -git-export
  git-fetch
  git-fetch-pack
  git-format-patch
@@@ -68,6 -70,7 +68,6 @@@ git-rese
  git-resolve
  git-rev-list
  git-rev-parse
 -git-rev-tree
  git-revert
  git-send-email
  git-send-pack
@@@ -93,3 -96,7 +93,7 @@@ git-verify-pac
  git-verify-tag
  git-whatchanged
  git-write-tree
+ #*.tar.gz
+ #*.dsc
+ #*.deb
+ #git-core.spec
diff --combined Documentation/git-diff-tree.txt
index 5aa4adcc4c,816c592ebf..7f18bbfc60
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@@ -9,12 -9,15 +9,15 @@@ git-diff-tree - Compares the content an
  
  SYNOPSIS
  --------
- 'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish> <tree-ish> [<path>...]
+ 'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
  
  DESCRIPTION
  -----------
  Compares the content and mode of the blobs found via two tree objects.
  
+ If there is only one <tree-ish> given, the commit is compared with its parents
+ (see --stdin below).
+ 
  Note that "git-diff-tree" can use the tree encapsulated in a commit object.
  
  OPTIONS
@@@ -126,5 -129,5 +129,5 @@@ Documentation by David Greaves, Junio 
  
  GIT
  ---
 -Part of the link:git.html[git] suite
 +Part of the gitlink:git[7] suite