Merge branch 'os/vcbuild'

[thirdparty/git.git] / Documentation / git.txt

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 3e50065198891b8f889d7905d8e0573ca791f02f..2f72b10224a0eb70835ff1ff70172fb6019f1462 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -304,6 +304,13 @@ users typically do not use them directly.
 
 include::cmds-purehelpers.txt[]
 
+Guides
+------
+
+The following documentation pages are guides about Git concepts.
+
+include::cmds-guide.txt[]
+
 
 Configuration Mechanism
 -----------------------
@@ -497,7 +504,8 @@ double-quotes and respecting backslash escapes. E.g., the value
        If this variable is set, the default hash algorithm for new
        repositories will be set to this value. This value is currently
        ignored when cloning; the setting of the remote repository
-       is used instead. The default is "sha1".
+       is used instead. The default is "sha1". THIS VARIABLE IS
+       EXPERIMENTAL! See `--object-format` in linkgit:git-init[1].
 
 Git Commits
 ~~~~~~~~~~~
@@ -543,8 +551,9 @@ Git Diffs
 
 `GIT_EXTERNAL_DIFF`::
        When the environment variable `GIT_EXTERNAL_DIFF` is set, the
-       program named by it is called, instead of the diff invocation
-       described above.  For a path that is added, removed, or modified,
+       program named by it is called to generate diffs, and Git
+       does not use its builtin diff machinery.
+       For a path that is added, removed, or modified,
        `GIT_EXTERNAL_DIFF` is called with 7 parameters:
 
        path old-file old-hex old-mode new-file new-hex new-mode
@@ -597,6 +606,12 @@ other
        an editor is to be launched. See also linkgit:git-var[1]
        and the `core.editor` option in linkgit:git-config[1].
 
+`GIT_SEQUENCE_EDITOR`::
+       This environment variable overrides the configured Git editor
+       when editing the todo list of an interactive rebase. See also
+       linkit::git-rebase[1] and the `sequence.editor` option in
+       linkit::git-config[1].
+
 `GIT_SSH`::
 `GIT_SSH_COMMAND`::
        If either of these environment variables is set then 'git fetch'