Merge branch 'os/vcbuild'

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

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 2fc92586b52386c770bed28a11275c64eea3414a..2f72b10224a0eb70835ff1ff70172fb6019f1462 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -551,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
@@ -605,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'