Re: [PATCH 2/2] rebase: don't rebase linear topology with --fork-point

On Fri, Feb 22, 2019 at 05:49:57PM +0100, Ævar Arnfjörð Bjarmason wrote: > Yes. I didn't dig far enough into this and will re-word & re-submit, > also with the feedback you had on 1/2. > > So here's my current understanding of this. > > It's b6266dc88b ("rebase--am: use --cherry-pick instead of

Re: [PATCH 2/2] rebase: don't rebase linear topology with --fork-point

On Fri, Feb 22 2019, Jeff King wrote: > On Thu, Feb 21, 2019 at 10:40:59PM +0100, Ævar Arnfjörð Bjarmason wrote: > >> Fix a regression introduced in 4f21454b55 ("merge-base: handle >> --fork-point without reflog", 2016-10-12). >> [...] > > OK, your explanation mostly makes sense to me, except fo

Re: [PATCH 2/2] rebase: don't rebase linear topology with --fork-point

On Thu, Feb 21, 2019 at 10:40:59PM +0100, Ævar Arnfjörð Bjarmason wrote: > Fix a regression introduced in 4f21454b55 ("merge-base: handle > --fork-point without reflog", 2016-10-12). > [...] OK, your explanation mostly makes sense to me, except for one thing. > Then in 4f21454b55 ("merge-base: h

[PATCH 2/2] rebase: don't rebase linear topology with --fork-point

Fix a regression introduced in 4f21454b55 ("merge-base: handle --fork-point without reflog", 2016-10-12). Before that change having a linear history on top of an upstream master would with --fork-point (aka argument-less rebase) tell us there was nothing to be done: $ git rebase Current b