summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-10-27 08:23:26 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-29 10:17:03 +0900
commit7f50a495f6c0e28a93b0e68584272a46ee2f20ff (patch)
tree654fb69049e5601ff45f44e9765a3701f13fd974
parentconfig.txt: move protocol.* to a separate file (diff)
downloadtgif-7f50a495f6c0e28a93b0e68584272a46ee2f20ff.tar.xz
config.txt: move pull-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>
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/config/pull.txt (renamed from Documentation/pull-config.txt)0
2 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e80148a133..9de16a498e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -385,7 +385,7 @@ include::config/pretty.txt[]
include::config/protocol.txt[]
-include::pull-config.txt[]
+include::config/pull.txt[]
include::push-config.txt[]
diff --git a/Documentation/pull-config.txt b/Documentation/config/pull.txt
index bb23a9947d..bb23a9947d 100644
--- a/Documentation/pull-config.txt
+++ b/Documentation/config/pull.txt