summaryrefslogtreecommitdiff
path: root/Documentation/config/merge.txt
diff options
context:
space:
mode:
authorLibravatar Philippe Blain <levraiphilippeblain@gmail.com>2020-08-31 03:40:08 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-31 11:45:05 -0700
commit902a126eca2d46b34dab822f1a1861bc2ce3cf48 (patch)
treee9aa56f2bf96836e30bba64e5ff0923cb8cddf46 /Documentation/config/merge.txt
parentpo: add missing letter for French message (diff)
downloadtgif-902a126eca2d46b34dab822f1a1861bc2ce3cf48.tar.xz
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>
Diffstat (limited to 'Documentation/config/merge.txt')
0 files changed, 0 insertions, 0 deletions