git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 0/6] Miscellaneous merge fixes
Date: Fri, 15 Apr 2016 14:14:12 -0700	[thread overview]
Message-ID: <CABPp-BEui_OVUES28TmUnWH3aGTJoMsgbAX2APVKNhx0eBAGJQ@mail.gmail.com> (raw)
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:
> 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

      reply	other threads:[~2016-04-15 21:14 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-10  6:13 [PATCH 0/6] Miscellaneous merge fixes Elijah Newren
2016-04-10  6:13 ` [PATCH 1/6] Remove duplicate code Elijah Newren
2016-04-10  6:13 ` [PATCH 2/6] Avoid checking working copy when creating a virtual merge base Elijah Newren
2016-04-13  1:28   ` Junio C Hamano
2016-04-10  6:13 ` [PATCH 3/6] Add merge testcases for when index doesn't match HEAD Elijah Newren
2016-04-10  6:13 ` [PATCH 4/6] merge-octopus: Abort if index does not " Elijah Newren
2016-04-10  6:13 ` [PATCH 5/6] Add a testcase demonstrating a bug with trivial merges Elijah Newren
2016-04-10  6:13 ` [PATCH 6/6] builtin/merge.c: Fix " Elijah Newren
2016-04-13  1:23 ` [PATCH 0/6] Miscellaneous merge fixes Junio C Hamano
2016-04-15 21:14   ` Elijah Newren [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CABPp-BEui_OVUES28TmUnWH3aGTJoMsgbAX2APVKNhx0eBAGJQ@mail.gmail.com \
    --to=newren@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).