From: Charles Bailey <charles@hashpling.org>
To: Stephen Leake <stephen_leake@stephe-leake.org>
Cc: git@vger.kernel.org
Subject: Re: [RFC 0/3] Make git more user-friendly during a merge conflict
Date: Fri, 28 Feb 2014 09:14:26 +0000 [thread overview]
Message-ID: <20140228091426.GA30620@hashpling.org> (raw)
In-Reply-To: <857g8f1ugu.fsf@stephe-leake.org>
On Fri, Feb 28, 2014 at 03:01:53AM -0600, Stephen Leake wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
> > And for experienced users, this would be a bad regression.
>
> Backward incompatibility is a real concern.
>
> It might be best if "git reset" (with _no_ option) be made to error out,
> so all users have to specify what they want.
This is just as much of a regression (if less dangerous) as changing
the default behaviour of git reset to touch the working tree.
'git reset' is a very, very common action for me and simply means
'reset [my index] [to HEAD]'. I frequently find myself resetting so
that I can stage something a bit different to what I had originally
intended.
next prev parent reply other threads:[~2014-02-28 9:20 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-26 18:06 [RFC 0/3] Make git more user-friendly during a merge conflict Andrew Wong
2014-02-26 18:06 ` [RFC 1/3] wt-status: Make conflict hint message more consistent with other hints Andrew Wong
2014-02-26 20:34 ` Jonathan Nieder
2014-02-26 20:37 ` Junio C Hamano
2014-02-26 23:07 ` Andrew Wong
2014-02-26 18:06 ` [RFC 2/3] merge: Add hints to tell users about "git merge --abort" Andrew Wong
2014-02-26 20:38 ` Jonathan Nieder
2014-02-26 23:16 ` Andrew Wong
2014-03-05 15:30 ` Andrew Wong
2014-03-05 18:29 ` Junio C Hamano
2014-03-05 20:51 ` Andrew Wong
2014-03-05 21:20 ` Junio C Hamano
2014-03-05 18:35 ` Matthieu Moy
2014-02-26 18:06 ` [RFC 3/3] reset: Change the default behavior to use "--merge" during a merge Andrew Wong
2014-02-26 18:21 ` Matthieu Moy
2014-02-26 20:15 ` Andrew Wong
2014-02-26 20:48 ` Jonathan Nieder
2014-02-26 23:37 ` Andrew Wong
2014-02-26 20:57 ` Matthieu Moy
2014-02-27 0:00 ` Andrew Wong
2014-02-26 20:53 ` Junio C Hamano
2014-03-11 4:39 ` Andrew Wong
2014-02-26 20:26 ` [RFC 0/3] Make git more user-friendly during a merge conflict Jonathan Nieder
2014-02-28 9:01 ` Stephen Leake
2014-02-28 9:14 ` Charles Bailey [this message]
2014-02-28 10:11 ` David Kastrup
2014-02-28 14:13 ` Stephen Leake
2014-02-28 14:21 ` David Kastrup
2014-02-28 17:26 ` Stephen Leake
2014-02-28 17:33 ` David Kastrup
2014-03-01 10:32 ` Stephen Leake
2014-03-01 11:38 ` Matthieu Moy
2014-03-01 16:50 ` Stephen Leake
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140228091426.GA30620@hashpling.org \
--to=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=stephen_leake@stephe-leake.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).