From: Junio C Hamano <gitster@pobox.com>
To: Andrew Wong <andrew.kw.w@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/3] merge: Advise user to use "git merge --abort" to abort merges
Date: Mon, 17 Mar 2014 14:58:41 -0700 [thread overview]
Message-ID: <xmqqr460bi7i.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1394771872-25940-3-git-send-email-andrew.kw.w@gmail.com> (Andrew Wong's message of "Fri, 14 Mar 2014 00:37:51 -0400")
Andrew Wong <andrew.kw.w@gmail.com> writes:
> Print message during "git merge" and "git status".
>
> Add a new "mergeHints" advice to silence these messages.
This sounds sensible. Don't we want to have this one take effect on
the places where advice.resolveConflict is used in git-pull?
I.e. something like:
do_we_advise=no
if advice.resolveConflict is not set:
if advice.mergeHints is set to false:
do_we_advise=no
else:
do_we_advise=yes
else:
do_we_advise=yes
if do_we_advise == 'yes':
give advice in die_conflict and die_merge
next prev parent reply other threads:[~2014-03-17 21:58 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 [this message]
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
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=xmqqr460bi7i.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=andrew.kw.w@gmail.com \
--cc=git@vger.kernel.org \
/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.