From: Junio C Hamano <gitster@pobox.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Git List <git@vger.kernel.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Christian Couder <christian.couder@gmail.com>,
Sverre Rabbelier <srabbelier@gmail.com>
Subject: Re: [RFC PATCH] revert: Implement --abort processing
Date: Thu, 02 Jun 2011 09:41:42 -0700 [thread overview]
Message-ID: <7vboygdw3d.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <BANLkTikgY_Kc6gu_iTtpiiayo9e=DPxOLw@mail.gmail.com> (Ramkumar Ramachandra's message of "Thu, 2 Jun 2011 18:33:42 +0530")
Ramkumar Ramachandra <artagnon@gmail.com> writes:
> I see now that this probably doesn't fit everyone's usecase. So the
> changes I propose are:
> 1. Don't rerere clear. We can probably document this fact somewhere,
> and hint the user about this during the time of abort.
> 2. Use reset --merge as Sverre suggested.
>
> I'll think about this workflow and post a patch soon.
Please do the former but I would advice you not to do the latter.
If you do not clear rerere then you are not serving the original audience
you wanted to serve, and if you do, you are hurting people when they do
want to keep rerere. You cannot win either way.
The users are better off being exposed to "reset --merge" than kept
unaware of the concepts necessary to do what they want hidden behind
"revert --abort" that has fuzzy semantics that restores some but not all,
with the definition of "some" being something we happened to decide here,
which can never match what the user in every situation would want.
prev parent reply other threads:[~2011-06-02 16:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <This is sli>
2011-06-01 16:07 ` [RFC PATCH] revert: Implement --abort processing Ramkumar Ramachandra
2011-06-01 16:24 ` Sverre Rabbelier
2011-06-01 17:38 ` Junio C Hamano
2011-06-01 19:00 ` Jonathan Nieder
2011-06-02 13:03 ` Ramkumar Ramachandra
2011-06-02 16:41 ` 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=7vboygdw3d.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=srabbelier@gmail.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 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).