From: Junio C Hamano Date: Thu, 30 May 2019 17:50:45 +0000 (-0700) Subject: Merge branch 'js/rebase-deprecate-preserve-merges' X-Git-Tag: v2.22.0-rc2~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2656eceae7dba180fb59a8ccbb448d8710c9f2d8?hp=-c Merge branch 'js/rebase-deprecate-preserve-merges' A bit more leftover clean-up to deprepcate "rebase -p". * js/rebase-deprecate-preserve-merges: rebase docs: recommend `-r` over `-p` docs: say that `--rebase=preserve` is deprecated tests: mark a couple more test cases as requiring `rebase -p` --- 2656eceae7dba180fb59a8ccbb448d8710c9f2d8 diff --combined Documentation/git-rebase.txt index f5e6ae3907,274870fed4..5e4e927647 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@@ -300,11 -300,6 +300,11 @@@ See also INCOMPATIBLE OPTIONS below + See also INCOMPATIBLE OPTIONS below. +--rerere-autoupdate:: +--no-rerere-autoupdate:: + Allow the rerere mechanism to update the index with the + result of auto-conflict resolution if possible. + -S[]:: --gpg-sign[=]:: GPG-sign commits. The `keyid` argument is optional and @@@ -415,7 -410,7 +415,7 @@@ See also INCOMPATIBLE OPTIONS below + By default, or when `no-rebase-cousins` was specified, commits which do not have `` as direct ancestor will keep their original branch point, -i.e. commits that would be excluded by gitlink:git-log[1]'s +i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `` (or ``, if specified). @@@ -675,7 -670,8 +675,8 @@@ $ git rebase -i HEAD~ And move the first patch to the end of the list. - You might want to preserve merges, if you have a history like this: + You might want to recreate merge commits, e.g. if you have a history + like this: ------------------ X @@@ -689,7 -685,7 +690,7 @@@ Suppose you want to rebase the side bra sure that the current HEAD is "B", and call ----------------------------- - $ git rebase -i -p --onto Q O + $ git rebase -i -r --onto Q O ----------------------------- Reordering and editing commits usually creates untested intermediate