Sync with 1.7.5.4

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

diff --combined Documentation/git.txt
index 65317cce18818a90f8176bd9518b4d73c2a25cf5,8c0bfdf5a08cf80419f35994d66b03a189d7ea2a..5c45446a4ac955630c8709e2184e52163185b8d4
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -9,7 -9,7 +9,7 @@@ git - the stupid content tracke
  SYNOPSIS
  --------
  [verse]
 -'git' [--version] [--exec-path[=<path>]] [--html-path]
 +'git' [--version] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
      [-p|--paginate|--no-pager] [--no-replace-objects]
      [--bare] [--git-dir=<path>] [--work-tree=<path>]
      [-c <name>=<value>]
@@@ -44,9 -44,10 +44,10 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.7.5.3/git.html[documentation for release 1.7.5.3]
+ * link:v1.7.5.4/git.html[documentation for release 1.7.5.4]
  
  * release notes for
+   link:RelNotes/1.7.5.4.txt[1.7.5.4],
    link:RelNotes/1.7.5.3.txt[1.7.5.3],
    link:RelNotes/1.7.5.2.txt[1.7.5.2],
    link:RelNotes/1.7.5.1.txt[1.7.5.1],
@@@ -290,16 -291,8 +291,16 @@@ help ...`
        the current setting and then exit.
  
  --html-path::
 -      Print the path to wherever your git HTML documentation is installed
 -      and exit.
 +      Print the path, without trailing slash, where git's HTML
 +      documentation is installed and exit.
 +
 +--man-path::
 +      Print the manpath (see `man(1)`) for the man pages for
 +      this version of git and exit.
 +
 +--info-path::
 +      Print the path where the Info files documenting this
 +      version of git are installed and exit.
  
  -p::
  --paginate::