Sync with 2.4.7

diff --git a/Documentation/git.txt b/Documentation/git.txt
index bd298a4d288319baf45563103f94d9d9959a045d..f3ab11c2e8d813d3e27b93d0abe34c33edfa04c9 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -841,6 +841,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
+       linkgit:git-worktree[1] for
+       details. This variable has lower precedence than other path
+       variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY...
+
 Git Commits
 ~~~~~~~~~~~
 'GIT_AUTHOR_NAME'::