summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/config/rebase.txt (renamed from Documentation/rebase-config.txt)0
-rw-r--r--Documentation/git-rebase.txt2
3 files changed, 2 insertions, 2 deletions
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
index 42e1ba7575..42e1ba7575 100644
--- a/Documentation/rebase-config.txt
+++ b/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
-------