From: Junio C Hamano <gitster@pobox•com>
To: Andrew Wong <andrew.kw.w@gmail•com>
Cc: "git\@vger.kernel.org" <git@vger•kernel.org>
Subject: Re: [PATCH 0/3] Make git more user-friendly during a merge conflict
Date: Wed, 19 Mar 2014 15:30:26 -0700 [thread overview]
Message-ID: <xmqqd2hh254t.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CADgNjakRSw-S4VbKnLC9PpmAcEi7iO=r0SBEy2XO3XhtDq=uJg@mail.gmail.com> (Andrew Wong's message of "Mon, 17 Mar 2014 19:25:00 -0400")
Andrew Wong <andrew.kw.w@gmail•com> writes:
> On Mon, Mar 17, 2014 at 7:04 PM, Junio C Hamano <gitster@pobox•com> wrote:
>> Has this series been tested with existing test suite? ...
> I tested it during RFC, but missed it when I sent it as patch.
> ...
> I'll fix the problem. Sorry about that.
Thanks. Will hold onto the topic branch lest I forget, but will
keep it out of 'pu' in the meantime.
prev parent reply other threads:[~2014-03-19 22:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-14 4:37 [PATCH 0/3] Make git more user-friendly during a merge conflict Andrew Wong
2014-03-14 4:37 ` [PATCH 1/3] wt-status: Make status messages more consistent with others Andrew Wong
2014-03-17 21:51 ` Junio C Hamano
2014-03-14 4:37 ` [PATCH 2/3] merge: Advise user to use "git merge --abort" to abort merges Andrew Wong
2014-03-17 21:58 ` Junio C Hamano
2014-03-14 4:37 ` [PATCH 3/3] reset: Print a warning when user uses "git reset" during a merge Andrew Wong
2014-03-14 14:33 ` Marc Branchaud
2014-03-14 17:04 ` Andrew Wong
2014-03-14 20:55 ` Junio C Hamano
2014-03-14 21:35 ` Andrew Wong
2014-03-15 19:23 ` Marc Branchaud
2014-03-17 21:54 ` Junio C Hamano
2014-03-17 23:04 ` [PATCH 0/3] Make git more user-friendly during a merge conflict Junio C Hamano
2014-03-17 23:25 ` Andrew Wong
2014-03-19 22:30 ` Junio C Hamano [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=xmqqd2hh254t.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=andrew.kw.w@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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