Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi, On Thu, 15 Feb 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > On Tue, 13 Feb 2018, Sergey Organov wrote: > > > >> Johannes Schindelin writes: > >> > >> > The wording is poor either way, but you are also not a native

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi, On Thu, 15 Feb 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > [...] > > >> > I'd not argue this way myself. If there are out-of-git-tree non-human > >> > users that accept and tweak todo _generated_ by current "git rebase -p" > >> > _command_, I

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Johannes, Johannes Schindelin writes: [...] >> > I'd not argue this way myself. If there are out-of-git-tree non-human >> > users that accept and tweak todo _generated_ by current "git rebase -p" >> > _command_, I also vote for a new option. >> > >> >> To be

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Johannes Schindelin writes: > Hi, > > On Tue, 13 Feb 2018, Sergey Organov wrote: > >> Johannes Schindelin writes: >> >> > The wording is poor either way, but you are also not a native speaker so >> > we have to rely on, say, Eric to help

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Sergey, On Tue, 13 Feb 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > > On Mon, 12 Feb 2018, Sergey Organov wrote: > > > >> Johannes Schindelin writes: > >> > > >> > On Fri, 9 Feb 2018, Sergey Organov wrote: > >> > >

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Jake, On Tue, 13 Feb 2018, Jacob Keller wrote: > On Mon, Feb 12, 2018 at 11:15 PM, Sergey Organov wrote: > > > > Jacob Keller writes: > > > >> On Mon, Feb 12, 2018 at 12:39 PM, Johannes Schindelin > >> wrote: > >>> >

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi, On Tue, 13 Feb 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > The wording is poor either way, but you are also not a native speaker so > > we have to rely on, say, Eric to help us out here. > > Likely, but why didn't you keep original wording

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Johannes Schindelin writes: [...] > Just to give you one concrete example: when I recently rebased some > patches (no reording or dropping involved here!) and one of the picks > failed with merge conflicts, I realized that that particular commit > introduced incorrect

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

On Mon, Feb 12, 2018 at 11:15 PM, Sergey Organov wrote: > Hi Jake, > > Jacob Keller writes: > >> On Mon, Feb 12, 2018 at 12:39 PM, Johannes Schindelin >> wrote: >>> Hi Sergey, >>> >>> On Mon, 12 Feb 2018, Sergey Organov

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Jake, Jacob Keller writes: > On Mon, Feb 12, 2018 at 12:39 PM, Johannes Schindelin > wrote: >> Hi Sergey, >> >> On Mon, 12 Feb 2018, Sergey Organov wrote: >>> > Have a look at https://github.com/git/git/pull/447, especially the >>> >

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Johannes, Johannes Schindelin writes: > Hi Sergey, > > On Mon, 12 Feb 2018, Sergey Organov wrote: > >> Thanks for explanations, and could you please answer this one: >> >> [...] >> >> >> I also have trouble making sense of "Recreate merge commits instead of >> >>

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Johannes, Johannes Schindelin writes: > Hi Sergey, > > On Mon, 12 Feb 2018, Sergey Organov wrote: > >> Johannes Schindelin writes: >> > >> > On Fri, 9 Feb 2018, Sergey Organov wrote: >> > >> >> Johannes Schindelin

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

On Mon, Feb 12, 2018 at 12:39 PM, Johannes Schindelin wrote: > Hi Sergey, > > On Mon, 12 Feb 2018, Sergey Organov wrote: >> > Have a look at https://github.com/git/git/pull/447, especially the >> > latest commit in there which is an early version of the deprecation I

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Sergey, On Mon, 12 Feb 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > > > On Fri, 9 Feb 2018, Sergey Organov wrote: > > > >> Johannes Schindelin writes: > >> > >> [...] > >> > >> > With this patch, the goodness of the

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Sergey, On Mon, 12 Feb 2018, Sergey Organov wrote: > Thanks for explanations, and could you please answer this one: > > [...] > > >> I also have trouble making sense of "Recreate merge commits instead of > >> flattening the history by replaying merges." Is it " >> commits by replaying

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Johannes Sixt writes: > Am 09.02.2018 um 07:11 schrieb Sergey Organov: >> Johannes Schindelin writes: >>> Let me explain the scenario which comes up plenty of times in my work with >>> Git for Windows. We have a thicket of some 70 branches on top of

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Johannes, Johannes Schindelin writes: > Hi Sergey, > > On Fri, 9 Feb 2018, Sergey Organov wrote: > >> Johannes Schindelin writes: >> >> [...] >> >> > With this patch, the goodness of the Git garden shears comes to `git >> > rebase -i`

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Johannes, Thanks for explanations, and could you please answer this one: [...] >> I also have trouble making sense of "Recreate merge commits instead of >> flattening the history by replaying merges." Is it "> commits by replaying merges> instead of " or is it >> rather " instead of >

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

On Thu, Feb 8, 2018 at 11:13 PM, Johannes Sixt wrote: > Am 09.02.2018 um 07:11 schrieb Sergey Organov: >> >> Johannes Schindelin writes: >>> >>> Let me explain the scenario which comes up plenty of times in my work >>> with >>> Git for Windows. We have

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Sergey, On Fri, 9 Feb 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > [...] > > > With this patch, the goodness of the Git garden shears comes to `git > > rebase -i` itself. Passing the `--recreate-merges` option will generate > > a todo list that

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Junio, On Tue, 23 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > > index 8a861c1e0d6..1d061373288 100644 > > --- a/Documentation/git-rebase.txt > > +++

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Am 09.02.2018 um 07:11 schrieb Sergey Organov: Johannes Schindelin writes: Let me explain the scenario which comes up plenty of times in my work with Git for Windows. We have a thicket of some 70 branches on top of git.git's latest release. These branches often

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Johannes Schindelin writes: [...] > With this patch, the goodness of the Git garden shears comes to `git > rebase -i` itself. Passing the `--recreate-merges` option will generate > a todo list that can be understood readily, and where it is obvious > how to reorder

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi, Johannes Schindelin writes: > On Wed, 7 Feb 2018, Sergey Organov wrote: >> Johannes Schindelin writes: >> > +--recreate-merges:: >> > + Recreate merge commits instead of flattening the history by replaying >> > + merges. Merge

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Junio, On Wed, 7 Feb 2018, Junio C Hamano wrote: > Øyvind Rønningstad writes: > > >> So no, I do not think that --recreate-merges --first-parent is a good > > idea > >> at all. Unless you try to do that non-interactively only, *and > > disallow it > >> in interactive

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Øyvind Rønningstad writes: >> So no, I do not think that --recreate-merges --first-parent is a good > idea >> at all. Unless you try to do that non-interactively only, *and > disallow it >> in interactive mode*. Correct. If the original side branch has commits A, B and

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

edit: Sending again, hopefully without HTML :). Sorry for spamming. Hi, I think --recreate-merges is a very exciting feature. I've also been puzzled by why we can't just pick merge commits directly including conflict resolutions, so allow me to join the discussion. On Wed, Feb 7, 2018 at 6:36

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi, On Wed, 7 Feb 2018, Sergey Organov wrote: > Johannes Schindelin writes: > > [...] > > > +--recreate-merges:: > > + Recreate merge commits instead of flattening the history by replaying > > + merges. Merge conflict resolutions or manual amendments to merge >

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Jacob Keller writes: > On Tue, Feb 6, 2018 at 10:16 PM, Sergey Organov wrote: >> Johannes Schindelin writes: >> >> [...] >> >>> +--recreate-merges:: >>> + Recreate merge commits instead of flattening the history by

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Am 07.02.2018 um 07:16 schrieb Sergey Organov: Johannes Schindelin writes: [...] +--recreate-merges:: + Recreate merge commits instead of flattening the history by replaying + merges. Merge conflict resolutions or manual amendments to merge +

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

On Tue, Feb 6, 2018 at 10:16 PM, Sergey Organov wrote: > Johannes Schindelin writes: > > [...] > >> +--recreate-merges:: >> + Recreate merge commits instead of flattening the history by replaying >> + merges. Merge conflict resolutions or

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Johannes Schindelin writes: [...] > +--recreate-merges:: > + Recreate merge commits instead of flattening the history by replaying > + merges. Merge conflict resolutions or manual amendments to merge > + commits are not preserved. I wonder why you guys

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Hi Eric, On Fri, 19 Jan 2018, Eric Sunshine wrote: > On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin > wrote: > > [...] > > With this patch, the goodness of the Git garden shears comes to `git > > rebase -i` itself. Passing the `--recreate-merges` option will

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

Johannes Schindelin writes: > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index 8a861c1e0d6..1d061373288 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -368,6 +368,11 @@ The commit list format can

Re: [PATCH 5/8] rebase: introduce the --recreate-merges option

On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin wrote: > [...] > With this patch, the goodness of the Git garden shears comes to `git > rebase -i` itself. Passing the `--recreate-merges` option will generate > a todo list that can be understood readily, and where

[PATCH 5/8] rebase: introduce the --recreate-merges option

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 at an answer