From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Sep 2019 04:19:31 +0000 (+0900)
Subject: Merge branch 'dl/rebase-i-keep-base'
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/640f9cd5994ed2061405aa94972b1746bb0c393e

Merge branch 'dl/rebase-i-keep-base'

"git rebase --keep-base <upstream>" 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
---

640f9cd5994ed2061405aa94972b1746bb0c393e
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
  -----------------------