diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:20 (GMT) |
| commit | 8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38 (patch) | |
| tree | f33b9ec70cc3d7e7a068d7ef24a6895d69accf00 /Documentation | |
| parent | 8feddda32cc50e928404788d7b9377c0b5f73f50 (diff) | |
| parent | 68aa495b590d417e88562ab1e5da7d84d0531f21 (diff) | |
| download | git-8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38.zip git-8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38.tar.gz git-8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38.tar.bz2 | |
Merge branch 'en/rebase-merge-on-sequencer'
"git rebase --merge" as been reimplemented by reusing the internal
machinery used for "git rebase -i".
* en/rebase-merge-on-sequencer:
rebase: implement --merge via the interactive machinery
rebase: define linearization ordering and enforce it
git-legacy-rebase: simplify unnecessary triply-nested if
git-rebase, sequencer: extend --quiet option for the interactive machinery
am, rebase--merge: do not overlook --skip'ed commits with post-rewrite
t5407: add a test demonstrating how interactive handles --skip differently
rebase: fix incompatible options error message
rebase: make builtin and legacy script error messages the same
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 4dd5853..7e695b3 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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 |