From: Jeff King <peff@peff.net>
To: Johannes Sixt <j6t@kdbg.org>
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 14:46:25 -0400 [thread overview]
Message-ID: <20120910184625.GA32237@sigill.intra.peff.net> (raw)
In-Reply-To: <504E333B.2010602@kdbg.org>
On Mon, Sep 10, 2012 at 08:36:43PM +0200, Johannes Sixt wrote:
> > [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. ;)
OK, then I withdraw my proposal. :)
It sounds like it would be safe to do:
git rebase --edit-todo
hack hack hack
git rebase --continue
anyway, so the restriction is not as valuable as it would otherwise have
been.
-Peff
next prev parent reply other threads:[~2012-09-10 18:46 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
2012-09-10 18:46 ` Jeff King [this message]
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=20120910184625.GA32237@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=andrew.kw.w@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.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).