diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-09-03 13:22:34 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-09-03 13:22:34 -0700 |
commit | 558abd28b6851f370edc902b483e079a3ac255ab (patch) | |
tree | 0b524b111b53d2a9487fb1c45b50dd7812965487 /git.html | |
parent | cf8aeaf7e987e73615910d6961e38f20a8b0b550 (diff) | |
download | git-htmldocs-558abd28b6851f370edc902b483e079a3ac255ab.tar.gz |
Autogenerated HTML docs for v2.28.0-450-g3a238
Diffstat (limited to 'git.html')
-rw-r--r-- | git.html | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -2899,8 +2899,9 @@ double-quotes and respecting backslash escapes. E.g., the value <dd>
<p>
When the environment variable <code>GIT_EXTERNAL_DIFF</code> 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,
<code>GIT_EXTERNAL_DIFF</code> is called with 7 parameters:
</p>
<div class="literalblock">
@@ -3006,6 +3007,17 @@ parameter, <path>.</p></div> </p>
</dd>
<dt class="hdlist1">
+<code>GIT_SEQUENCE_EDITOR</code>
+</dt>
+<dd>
+<p>
+ 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 <code>sequence.editor</code> option in
+ linkit::git-config[1].
+</p>
+</dd>
+<dt class="hdlist1">
<code>GIT_SSH</code>
</dt>
<dt class="hdlist1">
@@ -3551,7 +3563,7 @@ the Git Security mailing list <<a href="mailto:git-security@googlegroups.com" <div id="footer">
<div id="footer-text">
Last updated
- 2020-08-24 15:54:20 PDT
+ 2020-09-03 13:19:53 PDT
</div>
</div>
</body>
|