Document --unified/-U option

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 10c7bb3f459cedfadf64fcb99114ceaf6b961358..4c4d1746e03bdf47959ba58335785974d20efdee 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -42,9 +42,10 @@ 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.2.3/git.html[documentation for release 1.5.2.3]
+* link:v1.5.2.4/git.html[documentation for release 1.5.2.4]
 
 * release notes for
+  link:RelNotes-1.5.2.4.txt[1.5.2.4],
   link:RelNotes-1.5.2.3.txt[1.5.2.3],
   link:RelNotes-1.5.2.2.txt[1.5.2.2],
   link:RelNotes-1.5.2.1.txt[1.5.2.1],
@@ -410,8 +411,15 @@ parameter, <path>.
 
 other
 ~~~~~
+'GIT_MERGE_VERBOSITY'::
+       A number controlling the amount of output shown by
+       the recursive merge strategy.  Overrides merge.verbosity.
+       See gitlink:git-merge[1]
+
 'GIT_PAGER'::
-       This environment variable overrides `$PAGER`.
+       This environment variable overrides `$PAGER`. If it is set
+       to an empty string or to the value "cat", git will not launch
+       a pager.
 
 'GIT_FLUSH'::
        If this environment variable is set to "1", then commands such