Re: [PATCH v3] reset: add an example of how to split a commit into two

From: Jacob Keller <jacob.keller@gmail.com>
Date: Feb 16, 2017, 21:26 UTC
Message-ID: <CA+P7+xr4a+NK8Ye5DK7=EdDfZTSwuZsp3kG3DMHabCu5z+sbCQ@mail.gmail.com>
In-Reply-To: <xmqqpoihx6f4.fsf@gitster.mtv.corp.google.com>

On Thu, Feb 16, 2017 at 11:49 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 14 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
>
>> Jacob Keller <jacob.e.keller@intel.com> writes:
>>
>>> The interdiff between v2 and v3 is not really worth showing since I
>>> basically re-wrote the entire section a bit.
>>
>> Could this be made into an incremental, now that v2 has been in
>> 'next' for about 10 days, please?
>
> Nah, I think it is easier to read "log -p" if I just revert v2 out
> of existence from 'next', and queue this (with a minor typofixes) as
> a different topic to be merged later to 'master'.
>

Ok. Yea, I didn't even realize it was put into next because of the various comments I'd received. I guess I could have checked, but the diff really is bad when seeing incrementally.

Show 11 quoted lines

> So no need to resend and certainly no need to make it incremental.
>
>>> +Split a commit apart into a sequence of commits::
>>> ++
>>> +Suppose that you have create lots of logically separate changes and commit them
>>
>> s/create/&d/; s/commit/&ed/
>
> I'd do this myself while queuing.
>
> Thanks.

Thanks, Jake