From: Yann Dirson <ydirson@free.fr>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Eric Raible <raible@nextest.com>, Yann Dirson <dirson@bertin.fr>,
kevin@sb.org, git@vger.kernel.org
Subject: Re: [PATCH] git-rebase--interactive.sh: Add new command "shell"
Date: Thu, 4 Nov 2010 21:53:08 +0100 [thread overview]
Message-ID: <20101104205307.GA8911@home.lan> (raw)
In-Reply-To: <20101104181020.GB16431@burratino>
On Thu, Nov 04, 2010 at 01:10:20PM -0500, Jonathan Nieder wrote:
> How about:
>
> # Commands:
> # p, pick = use commit
> # r, reword = use commit, but edit the commit message
> # e, edit = use commit, but stop for amending
> # s, squash = use commit, but meld into previous commit
> # f, fixup = like "squash", but discard this commit's log message
> # x, exec = run command using shell, and stop if it fails
> #
> # The argument to edit is optional; if left out, it means to
> # stop to examine or amend the previous commit.
> #
> # If you remove a line here, THAT COMMIT WILL BE LOST.
> # However, if you remove everything, the rebase will be aborted.
> # Use the noop command if you really want to remove all commits.
That may be too far from the "edit" line, although I do like the idea
of mentionning other uses than "amend".
Eric Raible suggested:
> How about:
>
> # e [<commit>], edit [<commit>] = use commit (if present) but pause to amend
Other commands do not mention commit (or other things) as a synopsis would.
What about:
# e, edit = use commit (if specified) but pause to amend/examine/test
next prev parent reply other threads:[~2010-11-04 20:53 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-04 5:17 [PATCH] git-rebase--interactive.sh: Add new command "shell" Kevin Ballard
2010-11-04 5:22 ` Kevin Ballard
2010-11-04 8:42 ` Matthieu Moy
2010-11-04 8:53 ` Kevin Ballard
2010-11-04 9:23 ` Ævar Arnfjörð Bjarmason
2010-11-04 9:25 ` Kevin Ballard
2010-11-04 9:27 ` Ævar Arnfjörð Bjarmason
2010-11-04 10:24 ` Johannes Sixt
2010-11-04 9:36 ` Erik Faye-Lund
2010-11-04 9:43 ` Kevin Ballard
2010-11-04 10:25 ` Yann Dirson
2010-11-04 10:40 ` Erik Faye-Lund
2010-11-04 17:04 ` Eric Raible
2010-11-04 17:34 ` Matthieu Moy
2010-11-04 17:43 ` Eric Raible
2010-11-04 18:10 ` Jonathan Nieder
2010-11-04 20:53 ` Yann Dirson [this message]
2010-11-04 21:05 ` Eric Raible
2010-11-04 22:01 ` [PATCHv2] git-rebase--interactive.sh: extend "edit" command to be more useful Kevin Ballard
2010-11-04 21:33 ` [PATCH] git-rebase--interactive.sh: Add new command "shell" Kevin Ballard
2010-11-05 7:33 ` Johannes Sixt
2010-11-05 8:39 ` Kevin Ballard
2010-11-08 18:31 ` Junio C Hamano
2010-11-08 21:49 ` Kevin Ballard
2010-11-08 22:29 ` Yann Dirson
2010-11-10 1:42 ` Jonathan Nieder
2010-11-10 1:46 ` Kevin Ballard
2010-11-10 1:56 ` Jonathan Nieder
2010-11-10 7:43 ` Yann Dirson
2010-11-10 16:00 ` Matthieu Moy
2010-11-10 1:53 ` Jonathan Nieder
2010-11-10 2:14 ` Kevin Ballard
2010-11-24 20:19 ` [PATCHv3] git-rebase--interactive.sh: extend "edit" command to be more useful Kevin Ballard
2010-12-03 8:06 ` Jonathan Nieder
2010-12-03 8:16 ` Kevin Ballard
2010-12-03 8:55 ` Jonathan Nieder
2010-12-03 9:55 ` Johannes Sixt
2010-12-03 10:00 ` Jonathan Nieder
2010-12-03 10:14 ` Kevin Ballard
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=20101104205307.GA8911@home.lan \
--to=ydirson@free.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=dirson@bertin.fr \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=kevin@sb.org \
--cc=raible@nextest.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).