git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <j6t@kdbg.org>
To: Jeff King <peff@peff.net>
Cc: Andrew Wong <andrew.kw.w@gmail.com>,
	Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
	git@vger.kernel.org
Subject: Re: [PATCH] rebase -i: Teach "--edit" action
Date: Mon, 10 Sep 2012 20:36:43 +0200	[thread overview]
Message-ID: <504E333B.2010602@kdbg.org> (raw)
In-Reply-To: <20120910165457.GB14201@sigill.intra.peff.net>

Am 10.09.2012 18:54, schrieb Jeff King:
> On Mon, Sep 10, 2012 at 12:46:45PM -0400, Andrew Wong wrote:
> 
>>> Just "edit" may be a bit misleading, as we already have the "edit"
>>> action inside the todolist. I'd call this --edit-list to avoid
>>> ambiguity.
>>
>> I thought that might be a bit confusing too. "--edit-list" doesn't
>> seem informative about what "list" we're editing though. What about
>> "--edit-todo"? Any suggestions are welcomed.
> 
> Does it ever make sense to edit and then _not_ immediately continue?

Yes. For example, while you are resolving a conflict, you might notice
that it would make sense to do something different in the remaining
rebase sequence. You don't want to continue if some conflicts remain.
And you don't want to wait editing the todo list until you are done with
the conflicts because you might have forgotten that you wanted to do
something different.

> You can't affect the current commit anyway (it has already been pulled
> from the todo list), so the next thing you'd want to do it actually act
> on whatever you put into the todo list[1].

Oh, you said it here:

> [1] It does preclude using "--edit" to make a note about a later commit
>     while you are in the middle of resolving a conflict or something.
>     You'd have to do it at the end. I don't know if anybody actually
>     cares about that.

Yes, I do care. At times I tend to have a very short attention span. Or
it is Windows's slowness that expires my short-term memory more often
than not. ;)

-- Hannes

  reply	other threads:[~2012-09-10 18:36 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-10 16:14 [RFC] Add "edit" action for interactive rebase? Andrew Wong
2012-09-10 16:14 ` [PATCH] rebase -i: Teach "--edit" action Andrew Wong
2012-09-10 16:25   ` Matthieu Moy
2012-09-10 16:46     ` Andrew Wong
2012-09-10 16:54       ` Jeff King
2012-09-10 18:36         ` Johannes Sixt [this message]
2012-09-10 18:46           ` Jeff King
2012-09-10 19:33             ` Andrew Wong
2012-09-10 19:57               ` Junio C Hamano
2012-09-10 21:17                 ` Andrew Wong
2012-09-15 20:08                   ` [PATCH 0/3] rebase -i: Teach "--edit-todo" Andrew Wong
2012-09-15 20:08                     ` [PATCH 1/3] rebase -i: Refactor help messages for todo file Andrew Wong
2012-09-15 20:08                     ` [PATCH 2/3] rebase -i: Teach "--edit-todo" action Andrew Wong
2012-09-16  6:54                       ` Junio C Hamano
2012-09-16 15:49                         ` Andrew Wong
2012-09-18  6:56                           ` Junio C Hamano
2012-09-15 20:08                     ` [PATCH 3/3] rebase -i: Add tests for "--edit-todo" Andrew Wong
2012-09-16  6:58                       ` Junio C Hamano
2012-09-16 15:17                         ` [PATCH v2 1/3] rebase -i: Refactor help messages for todo file Andrew Wong
2012-09-16 15:17                           ` [PATCH v2 2/3] rebase -i: Teach "--edit-todo" action Andrew Wong
2012-09-17  6:11                             ` Martin von Zweigbergk
2012-09-18  1:28                               ` [PATCH v3 0/4] " Andrew Wong
2012-09-18  1:28                                 ` [PATCH 1/4] rebase usage: subcommands can not be combined with -i Andrew Wong
2012-09-18  1:28                                 ` [PATCH 2/4] rebase -i: Refactor help messages for todo file Andrew Wong
2012-09-18  1:28                                 ` [PATCH 3/4] rebase -i: Teach "--edit-todo" action Andrew Wong
2012-09-18  1:28                                 ` [PATCH 4/4] rebase -i: Add tests for "--edit-todo" Andrew Wong
2012-09-18  4:58                                   ` Martin von Zweigbergk
2012-09-18  5:23                                     ` Andrew Wong
2012-09-18  5:37                                       ` Martin von Zweigbergk
2012-09-19  6:43                                 ` [PATCH 5/4] rebase -i: suggest using --edit-todo to fix an unknown instruction Johannes Sixt
2012-09-19 19:52                                   ` Junio C Hamano
2012-09-16 15:17                           ` [PATCH v2 3/3] rebase -i: Add tests for "--edit-todo" Andrew Wong
2012-09-10 18:28 ` [RFC] Add "edit" action for interactive rebase? Johannes Sixt
2012-09-10 20:13   ` Andrew Wong

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=504E333B.2010602@kdbg.org \
    --to=j6t@kdbg.org \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=andrew.kw.w@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /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).