Merge 'fixes' branch.

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

diff --combined .gitignore
index e8ae8c352b4d1ca071188d0954caef3077d1ff48,92deccb291e28e5ed714da404db4a95e5b14394f..cc70c6c3dad02aacc9e436e537e8840b8f49f3c1
--- 1/.gitignore
--- 2/.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 5aa4adcc4cbd40e70a5f0f3e03ee477ccaf09e55,816c592ebf13ddd18fdf4ab7f0dbb9c8311be2e1..7f18bbfc60973bfe38305bcfc034d7caf0123abd
--- 1/Documentation/git-diff-tree.txt
--- 2/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