Web lists-archives.com

[PATCH 55/78] config.txt: move rebase-config.txt to config/




Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
---
 Documentation/config.txt                               | 2 +-
 Documentation/{rebase-config.txt => config/rebase.txt} | 0
 Documentation/git-rebase.txt                           | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Documentation/{rebase-config.txt => config/rebase.txt} (100%)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a6934fd87b..0079cb31ff 100644
--- 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 432baabe33..e98d1ac8ae 100644
--- 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
 -------
-- 
2.19.1.647.g708186aaf9