Re: [PATCH v8 09/16] rebase: introduce the --rebase-merges option

2018-04-24 Thread Johannes Schindelin
Hi Philip, On Sun, 22 Apr 2018, Philip Oakley wrote: > From: "Johannes Schindelin" > > Once upon a time, this here developer thought: wouldn't it be nice if, > > say, Git for Windows' patches on top of core Git could be represented as > > a thicket of branches, and be rebased on top of core Git

Re: [PATCH v8 09/16] rebase: introduce the --rebase-merges option

2018-04-24 Thread Johannes Schindelin
Hi Junio, On Tue, 24 Apr 2018, Junio C Hamano wrote: > "Philip Oakley" writes: > > >> +-r:: > >> +--rebase-merges:: > >> + By default, a rebase will simply drop merge commits and only rebase > >> + the non-merge commits. With this option, it will try to preserve > >> + the branching structure w

Re: [PATCH v8 09/16] rebase: introduce the --rebase-merges option

2018-04-24 Thread Johannes Schindelin
Hi Philip, On Sun, 22 Apr 2018, Philip Oakley wrote: > From: "Johannes Schindelin" > > Once upon a time, this here developer thought: wouldn't it be nice if, > > say, Git for Windows' patches on top of core Git could be represented as > > a thicket of branches, and be rebased on top of core Git

Re: [PATCH v8 09/16] rebase: introduce the --rebase-merges option

2018-04-23 Thread Junio C Hamano
"Philip Oakley" writes: >> +-r:: >> +--rebase-merges:: >> + By default, a rebase will simply drop merge commits and only rebase >> + the non-merge commits. With this option, it will try to preserve >> + the branching structure within the commits that are to be rebased, >> + by recreating the merg

Re: [PATCH v8 09/16] rebase: introduce the --rebase-merges option

2018-04-22 Thread Philip Oakley
From: "Johannes Schindelin" Once upon a time, this here developer thought: wouldn't it be nice if, say, Git for Windows' patches on top of core Git could be represented as a thicket of branches, and be rebased on top of core Git in order to maintain a cherry-pick'able set of patch series? The o

Re: [PATCH v8 09/16] rebase: introduce the --rebase-merges option

2018-04-22 Thread Philip Oakley
From: "Johannes Schindelin" Once upon a time, this here developer thought: wouldn't it be nice if, say, Git for Windows' patches on top of core Git could be represented as a thicket of branches, and be rebased on top of core Git in order to maintain a cherry-pick'able set of patch series? The o

[PATCH v8 09/16] rebase: introduce the --rebase-merges option

2018-04-21 Thread Johannes Schindelin
Once upon a time, this here developer thought: wouldn't it be nice if, say, Git for Windows' patches on top of core Git could be represented as a thicket of branches, and be rebased on top of core Git in order to maintain a cherry-pick'able set of patch series? The original attempt to answer this