diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 08:23:36 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-29 10:17:04 +0900 |
| commit | c332419995557f14c1f9280edb9006471e17b27e (patch) | |
| tree | fa395b42f26ad761a6c59b2412e7842fecd4ebf5 | |
| parent | config.txt: move sendemail-config.txt to config/ (diff) | |
| download | tgif-c332419995557f14c1f9280edb9006471e17b27e.tar.xz | |
config.txt: move sequencer.* to a separate file
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.txt | 6 | ||||
| -rw-r--r-- | Documentation/config/sequencer.txt | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 1c2a6ec3c5..ab504eaba2 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -405,11 +405,7 @@ include::config/reset.txt[] include::config/sendemail.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. +include::config/sequencer.txt[] showBranch.default:: The default set of branches for linkgit:git-show-branch[1]. diff --git a/Documentation/config/sequencer.txt b/Documentation/config/sequencer.txt new file mode 100644 index 0000000000..b48d532a96 --- /dev/null +++ b/Documentation/config/sequencer.txt @@ -0,0 +1,5 @@ +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. |