From: Richard Peterson <richard@rcpeterson.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>,
Philippe Vaucher <philippe.vaucher@gmail.com>,
git@vger.kernel.org
Subject: Re: git rebase --interactive commits order
Date: Wed, 11 May 2011 14:39:34 -0400 [thread overview]
Message-ID: <BANLkTik3i8rcgDSo4A9nQjnvr-gWmnkpmQ@mail.gmail.com> (raw)
In-Reply-To: <7v39klgng7.fsf@alter.siamese.dyndns.org>
On Wed, May 11, 2011 at 1:24 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Richard Peterson <richard@rcpeterson.com> writes:
>
>> On Tue, May 10, 2011 at 7:26 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>>
>>> Devils lie in the details. For example, should squash/fixup come before
>>> or after the squashed commit when --reverse is in effect, and why?
>>>
>>> Should "rebase --reverse --continue" work after it gets interrupted, if
>>> not why not?
>>
>> Yes, it should work,...
>
[...]
>
> You start 'rebase' (without --reverse); it stops with conflict. Now what
> should happen when you say 'rebase --reverse --continue' now? Does it
> error out because you are not allowed to change your mind once you
> started?
It just continues. "--reverse" is noise here. "--reverse" would only matter
in the display of the initial list. It's just as much noise here as
'--interactive'
would be noise here, like 'rebase --interactive --continue'.
> [...] Why spend extra effort only to introduce something confusing?
Because for some group of people, you are introducing something less
confusing. I have a hunch that some people see the *process* as the primary
artifact, and thus things make sense just as they are. Others see the *tree*
as the primary artifact, and want too see the transformation that will be
attempted on the tree - but interactive rebase has the tree upside down.
I have absolutely no support for this theory other than that I find myself in
the second group of people however small or large that group may be. I
conceive of a rebase as a transformation of the tree, rather than a set of
discrete steps. Tools that help me work with that abstraction are going to
be easier for me and others like me.
-Richard
next prev parent reply other threads:[~2011-05-11 18:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-09 9:30 git rebase --interactive commits order Philippe Vaucher
2011-05-09 10:10 ` David
2011-05-09 23:31 ` Steven E. Harris
2011-05-10 22:20 ` Philippe Vaucher
2011-05-10 22:30 ` Sverre Rabbelier
2011-05-10 23:26 ` Junio C Hamano
2011-05-11 15:43 ` Richard Peterson
2011-05-11 17:24 ` Junio C Hamano
2011-05-11 18:39 ` Richard Peterson [this message]
2011-05-11 18:45 ` Philippe Vaucher
2011-05-13 17:51 ` Nicolas Sebrecht
2011-05-14 10:58 ` Philippe Vaucher
2011-05-10 22:56 ` Junio C Hamano
2011-05-10 23:05 ` Philippe Vaucher
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=BANLkTik3i8rcgDSo4A9nQjnvr-gWmnkpmQ@mail.gmail.com \
--to=richard@rcpeterson.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philippe.vaucher@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).