Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
config.txt: move sequence.editor out of "core" part
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Wed, 22 Aug 2018 16:06:04 +0000
(18:06 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 12 Sep 2018 20:54:17 +0000
(13:54 -0700)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
701137e
)
diff --git
a/Documentation/config.txt
b/Documentation/config.txt
index 6990e75fe38724b9901041da249ceff2ed6e0152..f4c9c2c023db2eecd9a520166531fcfce690859a 100644
(file)
--- 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).
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
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[]
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].
showBranch.default::
The default set of branches for linkgit:git-show-branch[1].
See linkgit:git-show-branch[1].