From: Marc Branchaud <marcnarc@xiplink.com>
To: Junio C Hamano <gitster@pobox.com>, Andrew Wong <andrew.kw.w@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH 3/3] reset: Print a warning when user uses "git reset" during a merge
Date: Sat, 15 Mar 2014 15:23:43 -0400 [thread overview]
Message-ID: <5324A8BF.80308@xiplink.com> (raw)
In-Reply-To: <xmqqa9csh54f.fsf@gitster.dls.corp.google.com>
On 14-03-14 04:55 PM, Junio C Hamano wrote:
>
> So I am OK with "eventually error out by default", but not OK with
> "we know better than the user and will not allow it at all".
Can I interpret that as you being OK with my proposed "Cowardly
refusing" approach?
M.
next prev parent reply other threads:[~2014-03-15 19:32 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 [this message]
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
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=5324A8BF.80308@xiplink.com \
--to=marcnarc@xiplink.com \
--cc=andrew.kw.w@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.