Merge branch 'mr/rebase-i-customize-insn-sheet'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index bd298a4d288319baf45563103f94d9d9959a045d..f4cb5cb200cf69461d5af39d4c29b51138e4d3ec 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.5.0/git.html[documentation for release 2.5]
+
+* release notes for
+  link:RelNotes/2.5.0.txt[2.5],
+
 * link:v2.4.7/git.html[documentation for release 2.4.7]
 
 * release notes for
@@ -841,6 +846,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'::