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
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
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
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
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:
> >> >
>
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:
> >>>
>
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
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
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
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
>>> >
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
>> >>
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
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
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
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
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
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`
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 >
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
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
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
> > +++
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
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
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
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
Ø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
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
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
>
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
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
+
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
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
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
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
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
35 matches
Mail list logo