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: https://git.lorimer.id.au/gitweb.git/diff_plain/c72459006db60aa5e173e7d03d02b3bb76959a8e 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/config/rebase.txt b/Documentation/config/rebase.txt new file mode 100644 index 0000000000..42e1ba7575 --- /dev/null +++ b/Documentation/config/rebase.txt @@ -0,0 +1,52 @@ +rebase.stat:: + Whether to show a diffstat of what changed upstream since the last + rebase. False by default. + +rebase.autoSquash:: + If set to true enable `--autosquash` option by default. + +rebase.autoStash:: + When set to true, automatically create a temporary stash entry + before the operation begins, and apply it after the operation + ends. This means that you can run rebase on a dirty worktree. + However, use with care: the final stash application after a + successful rebase might result in non-trivial conflicts. + This option can be overridden by the `--no-autostash` and + `--autostash` options of linkgit:git-rebase[1]. + Defaults to false. + +rebase.missingCommitsCheck:: + If set to "warn", git rebase -i will print a warning if some + commits are removed (e.g. a line was deleted), however the + rebase will still proceed. If set to "error", it will print + the previous warning and stop the rebase, 'git rebase + --edit-todo' can then be used to correct the error. If set to + "ignore", no checking is done. + To drop a commit without warning or error, use the `drop` + command in the todo list. + Defaults to "ignore". + +rebase.instructionFormat:: + A format string, as specified in linkgit:git-log[1], to be used for the + todo list during an interactive rebase. The format will + automatically have the long commit hash prepended to the format. + +rebase.abbreviateCommands:: + If set to true, `git rebase` will use abbreviated command names in the + todo list resulting in something like this: ++ +------------------------------------------- + p deadbee The oneline of the commit + p fa1afe1 The oneline of the next commit + ... +------------------------------------------- ++ +instead of: ++ +------------------------------------------- + pick deadbee The oneline of the commit + pick fa1afe1 The oneline of the next commit + ... +------------------------------------------- ++ +Defaults to false. 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 ------- diff --git a/Documentation/rebase-config.txt b/Documentation/rebase-config.txt deleted file mode 100644 index 42e1ba7575..0000000000 --- a/Documentation/rebase-config.txt +++ /dev/null @@ -1,52 +0,0 @@ -rebase.stat:: - Whether to show a diffstat of what changed upstream since the last - rebase. False by default. - -rebase.autoSquash:: - If set to true enable `--autosquash` option by default. - -rebase.autoStash:: - When set to true, automatically create a temporary stash entry - before the operation begins, and apply it after the operation - ends. This means that you can run rebase on a dirty worktree. - However, use with care: the final stash application after a - successful rebase might result in non-trivial conflicts. - This option can be overridden by the `--no-autostash` and - `--autostash` options of linkgit:git-rebase[1]. - Defaults to false. - -rebase.missingCommitsCheck:: - If set to "warn", git rebase -i will print a warning if some - commits are removed (e.g. a line was deleted), however the - rebase will still proceed. If set to "error", it will print - the previous warning and stop the rebase, 'git rebase - --edit-todo' can then be used to correct the error. If set to - "ignore", no checking is done. - To drop a commit without warning or error, use the `drop` - command in the todo list. - Defaults to "ignore". - -rebase.instructionFormat:: - A format string, as specified in linkgit:git-log[1], to be used for the - todo list during an interactive rebase. The format will - automatically have the long commit hash prepended to the format. - -rebase.abbreviateCommands:: - If set to true, `git rebase` will use abbreviated command names in the - todo list resulting in something like this: -+ -------------------------------------------- - p deadbee The oneline of the commit - p fa1afe1 The oneline of the next commit - ... -------------------------------------------- -+ -instead of: -+ -------------------------------------------- - pick deadbee The oneline of the commit - pick fa1afe1 The oneline of the next commit - ... -------------------------------------------- -+ -Defaults to false.