Re: [PATCH 0/6] Miscellaneous merge fixes

From: Elijah Newren <newren@gmail.com>
Date: Apr 15, 2016, 21:14 UTC
Message-ID: <CABPp-BEui_OVUES28TmUnWH3aGTJoMsgbAX2APVKNhx0eBAGJQ@mail.gmail.com>
In-Reply-To: <xmqqd1pumhdr.fsf@gitster.mtv.corp.google.com>

Hi,

On Tue, Apr 12, 2016 at 6:23 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 15 quoted lines

> Elijah Newren <newren@gmail.com> writes:
>
>> Elijah Newren (6):
>>   Remove duplicate code
>>   Avoid checking working copy when creating a virtual merge base
>>   Add merge testcases for when index doesn't match HEAD
>>   merge-octopus: Abort if index does not match HEAD
>>   Add a testcase demonstrating a bug with trivial merges
>>   builtin/merge.c: Fix a bug with trivial merges
>
> Please be careful when giving titles to your patches.  They will be
> shown in a context that is much wider than the area your attention
> is currently concentrated on.  E.g. does "Remove duplicate code"
> tell readers of "git shortlog --no-merges v2.8.0..v2.9.0" what the
> change was about when it eventually appears in the upcoming release?

I will try to do better on that.  For the patch you mention, how about:
   merge-recursive: Remove a few lines of duplicate code
?

I can resubmit the series correcting both that subject and the subject of the second patch using your suggestion elsewhere in this thread. The other four already provide some context on their area; am I correct to assume those provide enough?

Elijah