Merge branch 'jc/lt-ref2-with-lt-refs' into jc/ref-locking

diff --git a/Documentation/git.txt b/Documentation/git.txt
index a9c87e38dae69b0799328917727867342eb5d22c..744c38dee3c1835bb5e0ace4834547e6113e3bda 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -303,6 +303,9 @@ gitlink:git-format-patch[1]::
 gitlink:git-grep[1]::
        Print lines matching a pattern.
 
+gitlink:gitk[1]::
+       The git repository browser.
+
 gitlink:git-log[1]::
        Shows commit logs.
 
@@ -483,13 +486,6 @@ gitlink:git-stripspace[1]::
        Filter out empty lines.
 
 
-Commands not yet documented
----------------------------
-
-gitlink:gitk[1]::
-       The gitk repository browser.
-
-
 Configuration Mechanism
 -----------------------
 
@@ -638,9 +634,18 @@ other
        This environment variable overrides `$PAGER`.
 
 'GIT_TRACE'::
-       If this variable is set git will print `trace:` messages on
+       If this variable is set to "1", "2" or "true" (comparison
+       is case insensitive), git will print `trace:` messages on
        stderr telling about alias expansion, built-in command
        execution and external command execution.
+       If this variable is set to an integer value greater than 1
+       and lower than 10 (strictly) then git will interpret this
+       value as an open file descriptor and will try to write the
+       trace messages into this file descriptor.
+       Alternatively, if this variable is set to an absolute path
+       (starting with a '/' character), git will interpret this
+       as a file path and will try to write the trace messages
+       into it.
 
 Discussion[[Discussion]]
 ------------------------