From: Junio C Hamano <gitster@pobox.com>
To: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>
Cc: Lucien Kong <Lucien.Kong@ensimag.imag.fr>,
git@vger.kernel.org,
Valentin Duperray <Valentin.Duperray@ensimag.imag.fr>,
Franck Jonas <Franck.Jonas@ensimag.imag.fr>,
Thomas Nguy <Thomas.Nguy@ensimag.imag.fr>,
Huynh Khoi Nguyen Nguyen
<Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [PATCHv5] rebase [-i --exec | -ix] <CMD>...
Date: Tue, 12 Jun 2012 07:46:20 -0700 [thread overview]
Message-ID: <7vk3zc4mgz.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4FD70A8E.7050502@in.waw.pl> ("Zbigniew =?utf-8?Q?J=C4=99drze?= =?utf-8?Q?jewski-Szmek=22's?= message of "Tue, 12 Jun 2012 11:23:26 +0200")
Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> writes:
> On 06/12/2012 10:05 AM, Lucien Kong wrote:
>> +-x <cmd>::
>> +--exec <cmd>::
>> + Append "exec <cmd>" after each commit application line. <cmd>
>> + will be interpreted as one or more shell commands (see
>> + INTERACTIVE MODE below).
>> ++
>> +This option has to be used along with the `--interactive` option
>> +explicitly. You may execute several commands between each commit
>> +applications. For this, you can use one instance of exec:
> Hi,
>
> this is still grammatically fishy, and has "between each commit
> applications", which was corrected above, but not here.
Not just grammo, but "between" is not correct, as there will be the
final test after the last "pick".
>> + git rebase -i --exec "cmd1; cmd2; ...".
>> ++
>> +You can also insert several instances of exec, if you wish to only
>> +have one command per line. For example:
> s/instances of exec/instances of --exec/
Not just that, in the explanation part, we tend to spell `--exec` to
make the part that needs to be literally typed stand out (also we
want to see dash-dash, not em-dash, in the formatted output).
>> + git rebase -i --exec "cmd1" --exec "cmd2" ...
>> ++
>> +If --autosquash is used, the "exec" lines will not be appended for the
>> +intermediate commits, and will only appear at the end of each
>> +squash/fixup series.
>> +
Same for `--autosquash`.
I do not think it is worth another round of resend at this point, so
please eyeball the version I fixed up and queued in 'pu' when it is
pushed out. I also moved the '-x <cmd>::' option description to
where it belongs (iow, not at the very beginning).
next prev parent reply other threads:[~2012-06-12 14:46 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-04 13:47 [PATCH] rebase [-i --exec | -ix] <CMD> Kong Lucien
2012-06-04 17:42 ` Junio C Hamano
2012-06-04 20:30 ` Matthieu Moy
2012-06-04 21:06 ` Junio C Hamano
2012-06-05 17:59 ` konglu
2012-06-05 18:13 ` Junio C Hamano
2012-06-04 17:48 ` Matthieu Moy
2012-06-06 10:34 ` [PATCHv2] " Lucien Kong
2012-06-06 20:03 ` Matthieu Moy
2012-06-06 22:54 ` Junio C Hamano
2012-06-07 8:25 ` Zbigniew Jędrzejewski-Szmek
2012-06-07 8:40 ` Johannes Sixt
2012-06-07 12:04 ` konglu
2012-06-07 13:43 ` Matthieu Moy
2012-06-08 14:53 ` [PATCHv3 1/2] git-rebase.txt: "--onto" option updated Lucien Kong
2012-06-08 14:53 ` [PATCHv3 2/2] rebase [-i --exec | -ix] <CMD> Lucien Kong
2012-06-08 17:02 ` Johannes Sixt
2012-06-08 18:56 ` Torsten Bögershausen
2012-06-08 19:15 ` konglu
2012-06-08 19:55 ` Torsten Bögershausen
2012-06-08 20:07 ` konglu
2012-06-08 20:51 ` Torsten Bögershausen
2012-06-08 21:03 ` konglu
2012-06-09 6:14 ` Torsten Bögershausen
2012-06-09 6:47 ` konglu
2012-06-10 10:44 ` [PATCHv4] " Lucien Kong
2012-06-10 11:56 ` Johannes Sixt
2012-06-11 15:14 ` Junio C Hamano
2012-06-12 18:55 ` Johannes Sixt
2012-06-12 20:29 ` Junio C Hamano
2012-06-12 8:05 ` [PATCHv5] " Lucien Kong
2012-06-12 9:23 ` Zbigniew Jędrzejewski-Szmek
2012-06-12 14:46 ` Junio C Hamano [this message]
2012-06-13 14:04 ` Zbigniew Jędrzejewski-Szmek
2012-06-13 17:32 ` Junio C Hamano
2012-06-13 18:05 ` konglu
2012-06-13 18:22 ` Junio C Hamano
2012-06-13 19:38 ` konglu
2012-06-13 20:59 ` Johannes Sixt
2012-06-13 21:07 ` Zbigniew Jędrzejewski-Szmek
2012-06-13 22:25 ` Junio C Hamano
2012-06-13 22:35 ` Junio C Hamano
2012-06-13 22:43 ` Zbigniew Jędrzejewski-Szmek
2012-06-14 6:57 ` Matthieu Moy
2012-06-14 14:08 ` Marc Branchaud
2012-06-08 15:00 ` [PATCHv3 1/2] git-rebase.txt: "--onto" option updated Matthieu Moy
2012-06-08 17:07 ` Junio C Hamano
2012-06-08 19:06 ` konglu
2012-06-08 19:52 ` Junio C Hamano
2012-06-08 20:08 ` konglu
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=7vk3zc4mgz.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Franck.Jonas@ensimag.imag.fr \
--cc=Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr \
--cc=Lucien.Kong@ensimag.imag.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=Thomas.Nguy@ensimag.imag.fr \
--cc=Valentin.Duperray@ensimag.imag.fr \
--cc=git@vger.kernel.org \
--cc=zbyszek@in.waw.pl \
/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).