From: Nguyễn Thái Ngọc Duy Date: Sat, 27 Oct 2018 06:23:28 +0000 (+0200) Subject: config.txt: move rebase-config.txt to config/ X-Git-Tag: v2.20.0-rc0~59^2~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c72459006db60aa5e173e7d03d02b3bb76959a8e;p=thirdparty%2Fgit.git config.txt: move rebase-config.txt to config/ Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- 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 -------