summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-08-22 18:06:04 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-12 13:54:17 -0700
commit8dc9d22dc642208416e3353750e5277df752b445 (patch)
tree38f8385f6cfb0c510f733c869f184f1bb359f02a
parentconfig.txt: move sendemail part out to a separate file (diff)
downloadtgif-8dc9d22dc642208416e3353750e5277df752b445.tar.xz
config.txt: move sequence.editor out of "core" part
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6990e75fe3..f4c9c2c023 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -832,12 +832,6 @@ core.packedRefsTimeout::
all; -1 means to try indefinitely. Default is 1000 (i.e.,
retry for 1 second).
-sequence.editor::
- Text editor used by `git rebase -i` for editing the rebase instruction file.
- The value is meant to be interpreted by the shell when it is used.
- It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.
- When not configured the default commit message editor is used instead.
-
core.pager::
Text viewer for use by Git commands (e.g., 'less'). The value
is meant to be interpreted by the shell. The order of preference
@@ -2688,6 +2682,12 @@ rerere.enabled::
include::sendemail-config.txt[]
+sequence.editor::
+ Text editor used by `git rebase -i` for editing the rebase instruction file.
+ The value is meant to be interpreted by the shell when it is used.
+ It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.
+ When not configured the default commit message editor is used instead.
+
showBranch.default::
The default set of branches for linkgit:git-show-branch[1].
See linkgit:git-show-branch[1].