Re: [PATCHv5] rebase [-i --exec | -ix] <CMD>...

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 12, 2012, 14:46 UTC
Message-ID: <7vk3zc4mgz.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4FD70A8E.7050502@in.waw.pl>

Zbigniew Jędrzejewski-Szmek  <zbyszek@in.waw.pl> writes:

Show 14 quoted lines

> 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".

Show 5 quoted lines

>> +	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).

Show 6 quoted lines

>> +	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).