config.txt: move rebase-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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a6934fd87bc0ded0b7f38a253df95929e4e9c5b8..0079cb31ff277c26c5395b1c7ce4377c4a06815c 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -389,7 +389,7 @@ include::config/pull.txt[]
 
 include::config/push.txt[]
 
-include::rebase-config.txt[]
+include::config/rebase.txt[]
 
 include::receive-config.txt[]
 

diff --git a/Documentation/rebase-config.txt b/Documentation/config/rebase.txt
similarity index 100%
rename from Documentation/rebase-config.txt
rename to Documentation/config/rebase.txt

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 432baabe33e50d5e6f582aea8a9dee1e6de58fc8..e98d1ac8ae720719cab33dfbdf3d32b6ff56f64c 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -203,7 +203,7 @@ Alternatively, you can undo the 'git rebase' with
 CONFIGURATION
 -------------
 
-include::rebase-config.txt[]
+include::config/rebase.txt[]
 
 OPTIONS
 -------