summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-10-27 08:23:35 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-29 10:17:04 +0900
commit0ee42c86cf71357aff761d7f491fa2fd9ea6e668 (patch)
tree5b91326684660f550cf9c59fcfe2078dd0f96148 /Documentation
parentconfig.txt: move reset.* to a separate file (diff)
downloadtgif-0ee42c86cf71357aff761d7f491fa2fd9ea6e668.tar.xz
config.txt: move sendemail-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/config/sendemail.txt (renamed from Documentation/sendemail-config.txt)0
2 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a6ce22a6d9..1c2a6ec3c5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -403,7 +403,7 @@ include::config/rerere.txt[]
include::config/reset.txt[]
-include::sendemail-config.txt[]
+include::config/sendemail.txt[]
sequence.editor::
Text editor used by `git rebase -i` for editing the rebase instruction file.
diff --git a/Documentation/sendemail-config.txt b/Documentation/config/sendemail.txt
index 0006faf800..0006faf800 100644
--- a/Documentation/sendemail-config.txt
+++ b/Documentation/config/sendemail.txt