diff options
| author | Philippe Blain <levraiphilippeblain@gmail.com> | 2020-08-31 06:40:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-31 21:45:05 +0300 |
| commit | 902a126eca2d46b34dab822f1a1861bc2ce3cf48 (patch) | |
| tree | e9aa56f2bf96836e30bba64e5ff0923cb8cddf46 | |
| parent | d9cd4331470f4d9d78677f12dc79063dab832f53 (diff) | |
doc: mention GIT_SEQUENCE_EDITOR and 'sequence.editor' more
The environment variable `GIT_SEQUENCE_EDITOR`, and the configuration
variable 'sequence.editor', which were added in 821881d88d ("rebase -i":
support special-purpose editor to edit insn sheet, 2011-10-17), are
mentioned in the `git config` man page but not anywhere else.
Include `config/sequencer.txt` in `git-rebase.txt`, so that both the
environment variable and the configuration setting are mentioned there.
Also, add `GIT_SEQUENCE_EDITOR` to the list of environment variables
in `git(1)`.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 374d2486f7..9e2f9576c3 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' |