From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Denton Liu" <liu.denton@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Johannes Sixt" <j6t@kdbg.org>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [RFC WIP PATCH v8 00/13] learn --keep-base & more
Date: Wed, 8 May 2019 02:12:39 +0200 [thread overview]
Message-ID: <20190508001252.15752-1-avarab@gmail.com> (raw)
In-Reply-To: <cover.1555832783.git.liu.denton@gmail.com>
This is a WIP series I have that I figured I'd send out as-is for
comment since Junio said he'd be merging dl/rebase-i-keep-base down.
So I wanted to test it, and as seen early in this series in 3/13 and
4/13 we had significant blindspots in our tests, i.e. there were no
tests for whether --no-ff bypassed the amended logic as it should.
As seen from those tests we may have some bugs here, either existing
or new, needs more poking at it. We are also inconsistent with whether
a --no-ff yields a different SHA-1 after the forced rebase, surely it
always should, no?
Then in 9/13 and 10/13 I re-added the incomplete patches I had in
https://public-inbox.org/git/20190221214059.9195-1-avarab@gmail.com/
to see if my tests passed with Denton's --fork-point code, they
do. Yay!
Left them there because I was wondering if I needed to port some/all
of the tests over, and maybe amend a commit message to reword some of
my findings in
https://public-inbox.org/git/871s3z6a4q.fsf@evledraar.gmail.com/
Then I have 11/13 and 12/13 which seem pretty sensible to me as-is,
and finally I wanted --preserve-merges and --rebase-merges to also
benefit from this logic, so 13/13 is a WIP patch for that. The code
should be done (although maybe there's a better way to do it...), but
it needs a better commit message & tests.
Denton Liu (6):
t3431: add rebase --fork-point tests
t3432: test rebase fast-forward behavior
rebase: refactor can_fast_forward into goto tower
rebase: fast-forward --onto in more cases
rebase: fast-forward --fork-point in more cases
rebase: teach rebase --keep-base
Ævar Arnfjörð Bjarmason (7):
t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
t3432: test for --no-ff's interaction with fast-forward
rebase tests: test linear branch topology
rebase: don't rebase linear topology with --fork-point
rebase: eliminate side-effects from can_fast_forward()
rebase: add a should_fast_forward() utility function
WIP: can_fast_forward() support for --preserve-merges and
--rebase-merges
Documentation/git-rebase.txt | 30 +++++-
builtin/rebase.c | 117 +++++++++++++++++-----
contrib/completion/git-completion.bash | 2 +-
t/t3400-rebase.sh | 2 +-
t/t3404-rebase-interactive.sh | 2 +-
t/t3416-rebase-onto-threedots.sh | 57 +++++++++++
t/t3421-rebase-topology-linear.sh | 44 +++++++++
t/t3431-rebase-fork-point.sh | 57 +++++++++++
t/t3432-rebase-fast-forward.sh | 128 +++++++++++++++++++++++++
9 files changed, 407 insertions(+), 32 deletions(-)
create mode 100755 t/t3431-rebase-fork-point.sh
create mode 100755 t/t3432-rebase-fast-forward.sh
Range-diff:
1: aececab3b4 = 1: 0c931f6275 t3431: add rebase --fork-point tests
2: 238bf1db83 = 2: b5bdca58db t3432: test rebase fast-forward behavior
-: ---------- > 3: 5d057a1240 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
-: ---------- > 4: 06084d9891 t3432: test for --no-ff's interaction with fast-forward
3: 526c03b5a9 = 5: f5a2172398 rebase: refactor can_fast_forward into goto tower
4: 10572de16f ! 6: ea90934368 rebase: fast-forward --onto in more cases
@@ -146,13 +146,13 @@
+++ b/t/t3432-rebase-fast-forward.sh
@@
changes='our and their changes'
- test_rebase_same_head success --onto B B
- test_rebase_same_head success --onto B... B
--test_rebase_same_head failure --onto master... master
-+test_rebase_same_head success --onto master... master
- test_rebase_same_head failure --fork-point --onto B B
- test_rebase_same_head failure --fork-point --onto B... B
--test_rebase_same_head failure --fork-point --onto master... master
-+test_rebase_same_head success --fork-point --onto master... master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+-test_rebase_same_head failure work same success work diff --onto master... master
++test_rebase_same_head success noop same success work diff --onto master... master
+ test_rebase_same_head failure work same success work diff --fork-point --onto B B
+ test_rebase_same_head failure work same success work diff --fork-point --onto B... B
+-test_rebase_same_head failure work same success work diff --fork-point --onto master... master
++test_rebase_same_head success noop same success work diff --fork-point --onto master... master
test_done
5: 446985193c ! 7: 46660cefe0 rebase: fast-forward --fork-point in more cases
@@ -55,35 +55,45 @@
--- a/t/t3432-rebase-fast-forward.sh
+++ b/t/t3432-rebase-fast-forward.sh
@@
- test_rebase_same_head success --onto master... master
- test_rebase_same_head success --no-fork-point
- test_rebase_same_head success --fork-point master
--test_rebase_same_head failure --fork-point --onto B B
--test_rebase_same_head failure --fork-point --onto B... B
-+test_rebase_same_head success --fork-point --onto B B
-+test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
+ }
- test_expect_success 'add work to side' '
-@@
- test_rebase_same_head success --onto master... master
- test_rebase_same_head success --no-fork-point
- test_rebase_same_head success --fork-point master
--test_rebase_same_head failure --fork-point --onto B B
--test_rebase_same_head failure --fork-point --onto B... B
-+test_rebase_same_head success --fork-point --onto B B
-+test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
+ changes='no changes'
+-test_rebase_same_head success work same success work same
++test_rebase_same_head success noop same success work same
+ test_rebase_same_head success noop same success noop-force same master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+ test_rebase_same_head success noop same success noop-force same --onto master... master
+ test_rebase_same_head success noop same success noop-force same --no-fork-point
+-test_rebase_same_head success work same success work same --fork-point master
+-test_rebase_same_head failure noop same success work diff --fork-point --onto B B
+-test_rebase_same_head failure work same success work diff --fork-point --onto B... B
+-test_rebase_same_head success work same success work same --fork-point --onto master... master
++test_rebase_same_head success noop same success work same --fork-point master
++test_rebase_same_head success noop same success work diff --fork-point --onto B B
++test_rebase_same_head success noop same success work diff --fork-point --onto B... B
++test_rebase_same_head success noop same success work same --fork-point --onto master... master
- test_expect_success 'add work to upstream' '
-@@
- test_rebase_same_head success --onto B B
- test_rebase_same_head success --onto B... B
- test_rebase_same_head success --onto master... master
--test_rebase_same_head failure --fork-point --onto B B
--test_rebase_same_head failure --fork-point --onto B... B
-+test_rebase_same_head success --fork-point --onto B B
-+test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
+ test_expect_success 'add work same to side' '
+ test_commit E
+ '
+
+ changes='our changes'
+-test_rebase_same_head success work same success work same
++test_rebase_same_head success noop same success work same
+ test_rebase_same_head success noop same success noop-force same master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+ test_rebase_same_head success noop same success noop-force same --onto master... master
+ test_rebase_same_head success noop same success noop-force same --no-fork-point
+-test_rebase_same_head success work same success work same --fork-point master
+-test_rebase_same_head failure work same success work diff --fork-point --onto B B
+-test_rebase_same_head failure work same success work diff --fork-point --onto B... B
+-test_rebase_same_head success work same success work same --fork-point --onto master... master
++test_rebase_same_head success noop same success work same --fork-point master
++test_rebase_same_head success noop same success work diff --fork-point --onto B B
++test_rebase_same_head success noop same success work diff --fork-point --onto B... B
++test_rebase_same_head success noop same success work same --fork-point --onto master... master
- test_done
+ test_expect_success 'add work same to upstream' '
+ git checkout master &&
6: 88096495c2 ! 8: a59ff76704 rebase: teach rebase --keep-base
@@ -149,8 +149,8 @@
N_("allow pre-rebase hook to run")),
OPT_NEGBIT('q', "quiet", &options.flags,
@@
- usage_with_options(builtin_rebase_usage,
- builtin_rebase_options);
+ warning(_("git rebase --preserve-merges is deprecated. "
+ "Use --rebase-merges instead."));
+ if (keep_base) {
+ if (options.onto_name)
@@ -296,46 +296,46 @@
--- a/t/t3432-rebase-fast-forward.sh
+++ b/t/t3432-rebase-fast-forward.sh
@@
- test_rebase_same_head success --onto B B
- test_rebase_same_head success --onto B... B
- test_rebase_same_head success --onto master... master
-+test_rebase_same_head success --keep-base master
-+test_rebase_same_head success --keep-base
- test_rebase_same_head success --no-fork-point
-+test_rebase_same_head success --keep-base --no-fork-point
- test_rebase_same_head success --fork-point master
- test_rebase_same_head success --fork-point --onto B B
- test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
-+test_rebase_same_head success --fork-point --keep-base master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+ test_rebase_same_head success noop same success noop-force same --onto master... master
++test_rebase_same_head success noop same success noop-force same --keep-base master
++test_rebase_same_head success noop same success noop-force same --keep-base
+ test_rebase_same_head success noop same success noop-force same --no-fork-point
++test_rebase_same_head success noop same success noop-force same --keep-base --no-fork-point
+ test_rebase_same_head success noop same success work same --fork-point master
+ test_rebase_same_head success noop same success work diff --fork-point --onto B B
+ test_rebase_same_head success noop same success work diff --fork-point --onto B... B
+ test_rebase_same_head success noop same success work same --fork-point --onto master... master
++test_rebase_same_head success noop same success work same --keep-base --keep-base master
- test_expect_success 'add work to side' '
+ test_expect_success 'add work same to side' '
test_commit E
@@
- test_rebase_same_head success --onto B B
- test_rebase_same_head success --onto B... B
- test_rebase_same_head success --onto master... master
-+test_rebase_same_head success --keep-base master
-+test_rebase_same_head success --keep-base
- test_rebase_same_head success --no-fork-point
-+test_rebase_same_head success --keep-base --no-fork-point
- test_rebase_same_head success --fork-point master
- test_rebase_same_head success --fork-point --onto B B
- test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
-+test_rebase_same_head success --fork-point --keep-base master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+ test_rebase_same_head success noop same success noop-force same --onto master... master
++test_rebase_same_head success noop same success noop-force same --keep-base master
++test_rebase_same_head success noop same success noop-force same --keep-base
+ test_rebase_same_head success noop same success noop-force same --no-fork-point
++test_rebase_same_head success noop same success noop-force same --keep-base --no-fork-point
+ test_rebase_same_head success noop same success work same --fork-point master
+ test_rebase_same_head success noop same success work diff --fork-point --onto B B
+ test_rebase_same_head success noop same success work diff --fork-point --onto B... B
+ test_rebase_same_head success noop same success work same --fork-point --onto master... master
++test_rebase_same_head success noop same success work same --fork-point --keep-base master
- test_expect_success 'add work to upstream' '
+ test_expect_success 'add work same to upstream' '
git checkout master &&
@@
- test_rebase_same_head success --onto B B
- test_rebase_same_head success --onto B... B
- test_rebase_same_head success --onto master... master
-+test_rebase_same_head success --keep-base master
-+test_rebase_same_head success --keep-base
- test_rebase_same_head success --fork-point --onto B B
- test_rebase_same_head success --fork-point --onto B... B
- test_rebase_same_head success --fork-point --onto master... master
-+test_rebase_same_head success --fork-point --keep-base master
+ test_rebase_same_head success noop same success noop-force diff --onto B B
+ test_rebase_same_head success noop same success noop-force diff --onto B... B
+ test_rebase_same_head success noop same success work diff --onto master... master
++test_rebase_same_head success noop same success work diff --keep-base master
++test_rebase_same_head success noop same success work diff --keep-base
+ test_rebase_same_head failure work same success work diff --fork-point --onto B B
+ test_rebase_same_head failure work same success work diff --fork-point --onto B... B
+ test_rebase_same_head success noop same success work diff --fork-point --onto master... master
++test_rebase_same_head success noop same success work diff --fork-point --keep-base master
test_done
-: ---------- > 9: 46ccfca308 rebase tests: test linear branch topology
-: ---------- > 10: b06e84c6d6 rebase: don't rebase linear topology with --fork-point
-: ---------- > 11: bf13aa8a80 rebase: eliminate side-effects from can_fast_forward()
-: ---------- > 12: 2ffbb6c342 rebase: add a should_fast_forward() utility function
-: ---------- > 13: 20c38b78c7 WIP: can_fast_forward() support for --preserve-merges and --rebase-merges
--
2.21.0.1020.gf2820cf01a
next prev parent reply other threads:[~2019-05-08 0:13 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-23 15:25 [PATCH 0/3] rebase: learn --keep-base Denton Liu
2019-03-23 15:25 ` [PATCH 1/3] rebase: teach rebase --keep-base Denton Liu
2019-03-24 3:46 ` Eric Sunshine
2019-03-24 13:20 ` Junio C Hamano
2019-03-25 0:06 ` Denton Liu
2019-03-25 5:41 ` Denton Liu
2019-04-01 10:45 ` Junio C Hamano
2019-03-24 13:37 ` Junio C Hamano
2019-03-25 5:47 ` Denton Liu
2019-03-25 18:50 ` Johannes Schindelin
2019-03-25 19:29 ` Denton Liu
2019-03-26 13:27 ` Johannes Schindelin
2019-03-23 15:25 ` [PATCH 2/3] t3416: test " Denton Liu
2019-03-23 15:25 ` [PATCH 3/3] git-rebase.txt: document --keep-base option Denton Liu
2019-03-24 13:15 ` [PATCH 0/3] rebase: learn --keep-base Junio C Hamano
2019-03-25 0:04 ` Denton Liu
2019-04-01 10:45 ` Junio C Hamano
2019-03-26 14:35 ` Ævar Arnfjörð Bjarmason
2019-03-26 17:50 ` Denton Liu
2019-03-26 20:35 ` Ævar Arnfjörð Bjarmason
2019-03-26 21:30 ` Denton Liu
2019-03-27 15:39 ` Ævar Arnfjörð Bjarmason
2019-03-28 22:17 ` [PATCH v2] rebase: teach rebase --keep-base Denton Liu
2019-03-28 23:13 ` Ævar Arnfjörð Bjarmason
2019-03-29 15:47 ` Johannes Schindelin
2019-03-29 17:52 ` Denton Liu
2019-04-01 10:46 ` Junio C Hamano
2019-04-01 20:51 ` [PATCH v3 0/4] " Denton Liu
2019-04-01 20:51 ` [PATCH v3 1/4] t3431: add rebase --fork-point tests Denton Liu
2019-04-04 20:28 ` Denton Liu
2019-04-05 11:15 ` SZEDER Gábor
2019-04-08 4:38 ` Junio C Hamano
2019-04-05 14:55 ` Johannes Schindelin
2019-04-05 17:25 ` Denton Liu
2019-04-05 17:51 ` Johannes Sixt
2019-04-05 18:51 ` Johannes Schindelin
2019-04-05 20:19 ` Johannes Schindelin
2019-04-05 21:10 ` SZEDER Gábor
2019-04-01 20:51 ` [PATCH v3 2/4] t3432: test rebase fast-forward behavior Denton Liu
2019-04-01 20:52 ` [PATCH v3 3/4] rebase: fast-forward --onto in more cases Denton Liu
2019-04-02 1:25 ` Junio C Hamano
2019-04-02 1:48 ` Junio C Hamano
2019-04-02 4:44 ` Denton Liu
2019-04-01 20:52 ` [PATCH v3 4/4] rebase: teach rebase --keep-base Denton Liu
2019-04-05 21:39 ` [PATCH v4 0/4] " Denton Liu
2019-04-05 21:40 ` [PATCH v4 1/4] t3431: add rebase --fork-point tests Denton Liu
2019-04-05 21:40 ` [PATCH v4 2/4] t3432: test rebase fast-forward behavior Denton Liu
2019-04-05 21:40 ` [PATCH v4 3/4] rebase: fast-forward --onto in more cases Denton Liu
2019-04-05 21:40 ` [PATCH v4 4/4] rebase: teach rebase --keep-base Denton Liu
2019-04-15 22:29 ` [PATCH v5 0/5] " Denton Liu
2019-04-15 22:29 ` [PATCH v5 1/5] t3431: add rebase --fork-point tests Denton Liu
2019-04-15 22:29 ` [PATCH v5 2/5] t3432: test rebase fast-forward behavior Denton Liu
2019-04-15 22:29 ` [PATCH v5 3/5] rebase: fast-forward --onto in more cases Denton Liu
2019-04-16 6:26 ` Junio C Hamano
2019-04-16 13:59 ` Phillip Wood
2019-04-17 6:44 ` Denton Liu
2019-04-17 14:14 ` Phillip Wood
2019-04-19 17:08 ` Denton Liu
2019-04-15 22:29 ` [PATCH v5 4/5] rebase: fast-forward --fork-point " Denton Liu
2019-04-15 22:29 ` [PATCH v5 5/5] rebase: teach rebase --keep-base Denton Liu
2019-04-17 18:01 ` [PATCH v6 0/5] " Denton Liu
2019-04-17 18:01 ` [PATCH v6 1/6] t3431: add rebase --fork-point tests Denton Liu
2019-04-17 18:01 ` [PATCH v6 2/6] t3432: test rebase fast-forward behavior Denton Liu
2019-04-17 18:01 ` [PATCH v6 3/6] rebase: refactor can_fast_forward into goto tower Denton Liu
2019-04-17 18:01 ` [PATCH v6 4/6] rebase: fast-forward --onto in more cases Denton Liu
2019-04-17 19:59 ` Phillip Wood
2019-04-17 18:01 ` [PATCH v6 5/6] rebase: fast-forward --fork-point " Denton Liu
2019-04-17 18:01 ` [PATCH v6 6/6] rebase: teach rebase --keep-base Denton Liu
2019-04-21 8:11 ` [PATCH v7 0/6] rebase: learn --keep-base Denton Liu
2019-04-21 8:11 ` [PATCH v7 1/6] t3431: add rebase --fork-point tests Denton Liu
2019-04-23 23:12 ` Denton Liu
2019-04-21 8:11 ` [PATCH v7 2/6] t3432: test rebase fast-forward behavior Denton Liu
2019-04-21 8:11 ` [PATCH v7 3/6] rebase: refactor can_fast_forward into goto tower Denton Liu
2019-04-21 8:11 ` [PATCH v7 4/6] rebase: fast-forward --onto in more cases Denton Liu
2019-04-21 8:11 ` [PATCH v7 5/6] rebase: fast-forward --fork-point " Denton Liu
2019-04-21 8:11 ` [PATCH v7 6/6] rebase: teach rebase --keep-base Denton Liu
2019-05-08 0:12 ` Ævar Arnfjörð Bjarmason [this message]
2019-05-08 3:57 ` [RFC WIP PATCH v8 00/13] learn --keep-base & more Junio C Hamano
2019-07-19 19:14 ` Junio C Hamano
2019-07-19 21:01 ` Denton Liu
2019-08-25 9:11 ` [PATCH v9 0/9] rebase: learn --keep-base and improvements on fast-forward behaviour Denton Liu
2019-08-25 9:11 ` [PATCH v9 1/9] t3431: add rebase --fork-point tests Denton Liu
2019-08-25 9:12 ` [PATCH v9 2/9] t3432: test rebase fast-forward behavior Denton Liu
2019-08-25 9:12 ` [PATCH v9 3/9] t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests Denton Liu
2019-08-25 9:12 ` [PATCH v9 4/9] t3432: test for --no-ff's interaction with fast-forward Denton Liu
2019-08-25 9:12 ` [PATCH v9 5/9] rebase: refactor can_fast_forward into goto tower Denton Liu
2019-08-25 13:17 ` Pratyush Yadav
2019-08-26 23:17 ` Denton Liu
2019-08-25 9:12 ` [PATCH v9 6/9] rebase: fast-forward --onto in more cases Denton Liu
2019-08-25 9:12 ` [PATCH v9 7/9] rebase: fast-forward --fork-point " Denton Liu
2019-08-25 9:12 ` [PATCH v9 8/9] rebase tests: test linear branch topology Denton Liu
2019-08-25 9:12 ` [PATCH v9 9/9] rebase: teach rebase --keep-base Denton Liu
2019-08-25 22:59 ` Philip Oakley
2019-08-26 19:37 ` [PATCH v9 0/9] rebase: learn --keep-base and improvements on fast-forward behaviour Junio C Hamano
2019-08-27 5:37 ` [PATCH v10 " Denton Liu
2019-08-27 5:37 ` [PATCH v10 1/9] t3431: add rebase --fork-point tests Denton Liu
2019-08-27 5:37 ` [PATCH v10 2/9] t3432: test rebase fast-forward behavior Denton Liu
2019-08-27 5:37 ` [PATCH v10 3/9] t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests Denton Liu
2019-08-27 5:37 ` [PATCH v10 4/9] t3432: test for --no-ff's interaction with fast-forward Denton Liu
2019-08-27 8:11 ` SZEDER Gábor
2019-08-27 5:37 ` [PATCH v10 5/9] rebase: refactor can_fast_forward into goto tower Denton Liu
2019-08-27 5:37 ` [PATCH v10 6/9] rebase: fast-forward --onto in more cases Denton Liu
2019-08-27 5:38 ` [PATCH v10 7/9] rebase: fast-forward --fork-point " Denton Liu
2019-08-27 5:38 ` [PATCH v10 8/9] rebase tests: test linear branch topology Denton Liu
2019-08-27 5:38 ` [PATCH v10 9/9] rebase: teach rebase --keep-base Denton Liu
2019-05-08 0:12 ` [RFC WIP PATCH v8 01/13] t3431: add rebase --fork-point tests Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 02/13] t3432: test rebase fast-forward behavior Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 03/13] t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 04/13] t3432: test for --no-ff's interaction with fast-forward Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 05/13] rebase: refactor can_fast_forward into goto tower Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 06/13] rebase: fast-forward --onto in more cases Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 07/13] rebase: fast-forward --fork-point " Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 08/13] rebase: teach rebase --keep-base Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 09/13] rebase tests: test linear branch topology Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 10/13] rebase: don't rebase linear topology with --fork-point Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 11/13] rebase: eliminate side-effects from can_fast_forward() Ævar Arnfjörð Bjarmason
2019-05-17 21:16 ` Johannes Schindelin
2019-05-08 0:12 ` [RFC WIP PATCH v8 12/13] rebase: add a should_fast_forward() utility function Ævar Arnfjörð Bjarmason
2019-05-08 0:12 ` [RFC WIP PATCH v8 13/13] WIP: can_fast_forward() support for --preserve-merges and --rebase-merges Ævar Arnfjörð Bjarmason
2019-05-17 22:02 ` Johannes Schindelin
2019-04-06 19:44 ` [PATCH v3 0/4] rebase: teach rebase --keep-base Ævar Arnfjörð Bjarmason
2019-04-06 20:38 ` Denton Liu
2019-04-13 21:10 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190508001252.15752-1-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=liu.denton@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).