summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-09-03 19:37:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-03 19:37:06 (GMT)
commited9d8331d25eae29aa24a2859bde6450aebe0bc3 (patch)
tree3fdbba52922e0145bef08387d5da77ea59ceea5a /Documentation/git-rebase.txt
parentda6b99c39abee3f6882ac35814485330bd344dfd (diff)
parent902a126eca2d46b34dab822f1a1861bc2ce3cf48 (diff)
downloadgit-ed9d8331d25eae29aa24a2859bde6450aebe0bc3.zip
git-ed9d8331d25eae29aa24a2859bde6450aebe0bc3.tar.gz
git-ed9d8331d25eae29aa24a2859bde6450aebe0bc3.tar.bz2
Merge branch 'pb/doc-sequence-editor-configuration'
Doc update. * pb/doc-sequence-editor-configuration: doc: mention GIT_SEQUENCE_EDITOR and 'sequence.editor' more
Diffstat (limited to 'Documentation/git-rebase.txt')
-rw-r--r--Documentation/git-rebase.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index e8df8d5..38e1548 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
-------