Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 959c9d46f50b5b68a2c8d52a9ccb188c607dde85..2789da4f8fb4b06c26cfc27abfecf01392e75ae5 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,6 +43,11 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
+* link:v2.4.0/git.html[documentation for release 2.4]
+
+* release notes for
+  link:RelNotes/2.4.0.txt[2.4].
+
 * link:v2.3.7/git.html[documentation for release 2.3.7]
 
 * release notes for
@@ -828,6 +833,15 @@ Git so take care if using Cogito etc.
        an explicit repository directory set via 'GIT_DIR' or on the
        command line.
 
+'GIT_COMMON_DIR'::
+       If this variable is set to a path, non-worktree files that are
+       normally in $GIT_DIR will be taken from this path
+       instead. Worktree-specific files such as HEAD or index are
+       taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and
+       the section 'MULTIPLE CHECKOUT MODE' in linkgit:checkout[1]
+       details. This variable has lower precedence than other path
+       variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY...
+
 Git Commits
 ~~~~~~~~~~~
 'GIT_AUTHOR_NAME'::