From: Andrew Wong <andrew.kw.w@gmail.com>
To: git@vger.kernel.org
Cc: Andrew Wong <andrew.kw.w@gmail.com>
Subject: [PATCH 0/3] Make git more user-friendly during a merge conflict
Date: Fri, 14 Mar 2014 00:37:49 -0400 [thread overview]
Message-ID: <1394771872-25940-1-git-send-email-andrew.kw.w@gmail.com> (raw)
2/3: I've added advice.mergeHints to silent the messages that suggests "git
merge--abort".
3/3: I've added a warning message when users used "git reset" during a merge.
This warning will be printed if the user is in the middle of a merge. In future
releases, we'll change this into an error to prevent work tree from becoming a
mess.
Andrew Wong (3):
wt-status: Make status messages more consistent with others
merge: Advise user to use "git merge --abort" to abort merges
reset: Print a warning when user uses "git reset" during a merge
Documentation/config.txt | 3 +++
advice.c | 2 ++
advice.h | 1 +
builtin/merge.c | 6 ++++++
builtin/reset.c | 21 +++++++++++++++++++++
wt-status.c | 23 +++++++++++++----------
6 files changed, 46 insertions(+), 10 deletions(-)
--
1.9.0.174.g6f75b8f
next reply other threads:[~2014-03-14 4:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-14 4:37 Andrew Wong [this message]
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
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=1394771872-25940-1-git-send-email-andrew.kw.w@gmail.com \
--to=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 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).