Add pretty format %aN which gives the author name, respecting .mailmap

diff --git a/Documentation/git.txt b/Documentation/git.txt
index cf67110a91459ab938d2af70ef62a1aa38d1021b..0d6fe9cf79a5d6c65d3c94cb237cf85ccade2aef 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,7 +43,14 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.5.5/git.html[documentation for release 1.5.5]
+* link:v1.5.6.2/git.html[documentation for release 1.5.6.2]
+
+* release notes for
+  link:RelNotes-1.5.6.2.txt[1.5.6.2].
+  link:RelNotes-1.5.6.1.txt[1.5.6.1].
+  link:RelNotes-1.5.6.txt[1.5.6].
+
+* link:v1.5.5.4/git.html[documentation for release 1.5.5.4]
 
 * release notes for
   link:RelNotes-1.5.5.4.txt[1.5.5.4],
@@ -52,8 +59,6 @@ Documentation for older releases are available here:
   link:RelNotes-1.5.5.1.txt[1.5.5.1],
   link:RelNotes-1.5.5.txt[1.5.5].
 
-* link:v1.5.5.4/git.html[documentation for release 1.5.5.4]
-
 * link:v1.5.4.5/git.html[documentation for release 1.5.4.5]
 
 * release notes for
@@ -77,6 +82,8 @@ Documentation for older releases are available here:
   link:RelNotes-1.5.3.1.txt[1.5.3.1],
   link:RelNotes-1.5.3.txt[1.5.3].
 
+* link:v1.5.2.5/git.html[documentation for release 1.5.2.5]
+
 * release notes for
   link:RelNotes-1.5.2.5.txt[1.5.2.5],
   link:RelNotes-1.5.2.4.txt[1.5.2.4],
@@ -138,7 +145,8 @@ help ...'.
        environment variable. If no path is given 'git' will print
        the current setting and then exit.
 
--p|--paginate::
+-p::
+--paginate::
        Pipe all output into 'less' (or if set, $PAGER).
 
 --no-pager::