diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-03 22:37:06 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-03 22:37:06 +0300 |
| commit | ed9d8331d25eae29aa24a2859bde6450aebe0bc3 (patch) | |
| tree | 3fdbba52922e0145bef08387d5da77ea59ceea5a | |
| parent | da6b99c39abee3f6882ac35814485330bd344dfd (diff) | |
| parent | 902a126eca2d46b34dab822f1a1861bc2ce3cf48 (diff) | |
Merge branch 'pb/doc-sequence-editor-configuration'
Doc update.
* pb/doc-sequence-editor-configuration:
doc: mention GIT_SEQUENCE_EDITOR and 'sequence.editor' more
| -rw-r--r-- | Documentation/git-rebase.txt | 1 | ||||
| -rw-r--r-- | Documentation/git.txt | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index e8df8d5214..38e15488f6 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -204,6 +204,7 @@ CONFIGURATION ------------- include::config/rebase.txt[] +include::config/sequencer.txt[] OPTIONS ------- diff --git a/Documentation/git.txt b/Documentation/git.txt index 2fc92586b5..0bb1cfb239 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -605,6 +605,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' |