From: Junio C Hamano Date: Wed, 18 Sep 2019 22:21:50 +0000 (-0700) Subject: Merge branch 'dl/rebase-i-keep-base' into next X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f94f4867243e2302c6a178be9afa533a5fca1841;p=git Merge branch 'dl/rebase-i-keep-base' into next "git rebase --keep-base " tries to find the original base of the topic being rebased and rebase on top of that same base, which is useful when running the "git rebase -i" (and its limited variant "git rebase -x"). The command also has learned to fast-forward in more cases where it can instead of replaying to recreate identical commits. * dl/rebase-i-keep-base: rebase: teach rebase --keep-base rebase tests: test linear branch topology rebase: fast-forward --fork-point in more cases rebase: fast-forward --onto in more cases rebase: refactor can_fast_forward into goto tower t3432: test for --no-ff's interaction with fast-forward t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests t3432: test rebase fast-forward behavior t3431: add rebase --fork-point tests --- f94f4867243e2302c6a178be9afa533a5fca1841 diff --cc Documentation/git-rebase.txt index 7ecf766077,3146c1592d..639a4179d1 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@@ -543,6 -565,10 +565,8 @@@ In addition, the following pairs of opt * --preserve-merges and --interactive * --preserve-merges and --signoff * --preserve-merges and --rebase-merges - * --rebase-merges and --strategy - * --rebase-merges and --strategy-option + * --keep-base and --onto + * --keep-base and --root BEHAVIORAL DIFFERENCES -----------------------