diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 23:20:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 23:20:47 -0800 |
| commit | 23168ef89678fc52e01173bbc7fdaa760f21d02a (patch) | |
| tree | 8425bac71f938dfce77a3c2928b2c936b03789c9 /git-rebase.txt | |
| parent | 2567b326fac6961a6fc6075ad2f22a744252f2f3 (diff) | |
| download | git-htmldocs-23168ef89678fc52e01173bbc7fdaa760f21d02a.tar.gz | |
Autogenerated HTML docs for v2.21.0-rc0
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 4dd5853d6..7e695b30e 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -515,15 +515,7 @@ See also INCOMPATIBLE OPTIONS below. INCOMPATIBLE OPTIONS -------------------- -git-rebase has many flags that are incompatible with each other, -predominantly due to the fact that it has three different underlying -implementations: - - * one based on linkgit:git-am[1] (the default) - * one based on git-merge-recursive (merge backend) - * one based on linkgit:git-cherry-pick[1] (interactive backend) - -Flags only understood by the am backend: +The following options: * --committer-date-is-author-date * --ignore-date @@ -531,15 +523,12 @@ Flags only understood by the am backend: * --ignore-whitespace * -C -Flags understood by both merge and interactive backends: +are incompatible with the following options: * --merge * --strategy * --strategy-option * --allow-empty-message - -Flags only understood by the interactive backend: - * --[no-]autosquash * --rebase-merges * --preserve-merges @@ -550,7 +539,7 @@ Flags only understood by the interactive backend: * --edit-todo * --root when used in combination with --onto -Other incompatible flag pairs: +In addition, the following pairs of options are incompatible: * --preserve-merges and --interactive * --preserve-merges and --signoff |