Sync with 1.7.3.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --cc Documentation/diff-options.txt
Simple merge

diff --cc Documentation/git-repack.txt
index 9566727f7ad6c1690571f7321f79da951c8c6b50,af79b86516764617163b020ec3c4d9bbeda9fe9b..27f7865b061cc96398f7aa052d162723e1f9255e
--- 1/Documentation/git-repack.txt
--- 2/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@@ -8,7 -8,7 +8,7 @@@ git-repack - Pack unpacked objects in 
  
  SYNOPSIS
  --------
- 'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=N] [--depth=N]
 -'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
++'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
  
  DESCRIPTION
  -----------

diff --cc builtin/commit-tree.c
Simple merge

diff --cc fast-import.c
Simple merge

diff --cc git-am.sh
Simple merge