Merge branch 'ns/stash'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 157ef29131ebcdbd60f81507681e68ac84ce307c..10c7bb3f459cedfadf64fcb99114ceaf6b961358 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -10,7 +10,8 @@ SYNOPSIS
 --------
 [verse]
 'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate]
-    [--bare] [--git-dir=GIT_DIR] [--help] COMMAND [ARGS]
+    [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
+    [--help] COMMAND [ARGS]
 
 DESCRIPTION
 -----------
@@ -41,9 +42,19 @@ 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.1.5/git.html[documentation for release 1.5.1.5]
+* link:v1.5.2.3/git.html[documentation for release 1.5.2.3]
 
-* release notes for link:RelNotes-1.5.1.5.txt[1.5.1.5],
+* release notes for
+  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],
+  link:RelNotes-1.5.2.txt[1.5.2].
+
+* link:v1.5.1.6/git.html[documentation for release 1.5.1.6]
+
+* release notes for
+  link:RelNotes-1.5.1.6.txt[1.5.1.6],
+  link:RelNotes-1.5.1.5.txt[1.5.1.5],
   link:RelNotes-1.5.1.4.txt[1.5.1.4],
   link:RelNotes-1.5.1.3.txt[1.5.1.3],
   link:RelNotes-1.5.1.2.txt[1.5.1.2],
@@ -52,7 +63,8 @@ Documentation for older releases are available here:
 
 * link:v1.5.0.7/git.html[documentation for release 1.5.0.7]
 
-* release notes for link:RelNotes-1.5.0.7.txt[1.5.0.7],
+* release notes for
+  link:RelNotes-1.5.0.7.txt[1.5.0.7],
   link:RelNotes-1.5.0.6.txt[1.5.0.6],
   link:RelNotes-1.5.0.5.txt[1.5.0.5],
   link:RelNotes-1.5.0.3.txt[1.5.0.3],
@@ -93,6 +105,14 @@ OPTIONS
        Set the path to the repository. This can also be controlled by
        setting the GIT_DIR environment variable.
 
+--work-tree=<path>::
+       Set the path to the working tree.  The value will not be
+       used in combination with repositories found automatically in
+       a .git directory (i.e. $GIT_DIR is not set).
+       This can also be controlled by setting the GIT_WORK_TREE
+       environment variable and the core.worktree configuration
+       variable.
+
 --bare::
        Same as --git-dir=`pwd`.
 
@@ -337,6 +357,13 @@ git so take care if using Cogito etc.
        specifies a path to use instead of the default `.git`
        for the base of the repository.
 
+'GIT_WORK_TREE'::
+       Set the path to the working tree.  The value will not be
+       used in combination with repositories found automatically in
+       a .git directory (i.e. $GIT_DIR is not set).
+       This can also be controlled by the '--work-tree' command line
+       option and the core.worktree configuration variable.
+
 git Commits
 ~~~~~~~~~~~
 'GIT_AUTHOR_NAME'::
@@ -386,6 +413,16 @@ other
 'GIT_PAGER'::
        This environment variable overrides `$PAGER`.
 
+'GIT_FLUSH'::
+       If this environment variable is set to "1", then commands such
+       as git-blame (in incremental mode), git-rev-list, git-log,
+       git-whatchanged, etc., will force a flush of the output stream
+       after each commit-oriented record have been flushed.   If this
+       variable is set to "0", the output of these commands will be done
+       using completely buffered I/O.   If this environment variable is
+       not set, git will choose buffered or record-oriented flushing
+       based on whether stdout appears to be redirected to a file or not.
+
 'GIT_TRACE'::
        If this variable is set to "1", "2" or "true" (comparison
        is case insensitive), git will print `trace:` messages on
@@ -420,4 +457,3 @@ contributors on the git-list <git@vger.kernel.org>.
 GIT
 ---
 Part of the gitlink:git[7] suite
-