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.txt | |
| parent | cf8aeaf7e987e73615910d6961e38f20a8b0b550 (diff) | |
| download | git-htmldocs-558abd28b6851f370edc902b483e079a3ac255ab.tar.gz | |
Autogenerated HTML docs for v2.28.0-450-g3a238
Diffstat (limited to 'git.txt')
| -rw-r--r-- | git.txt | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -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' |