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

From

Junio C Hamano <gitster@pobox.com>

Date

Jun 13, 2012, 22:25 UTC

Message-ID

<7vvciug88g.fsf@alter.siamese.dyndns.org>

In-Reply-To

<4FD8FF25.6030908@kdbg.org>

Johannes Sixt <j6t@kdbg.org> writes:

> Not so fast.
>
> 	exec cmd1 && cmd2
> and
> 	exec cmd1
> 	exec cmd2
>
> are far from equivalent: If cmd1 fails, the first version never runs
> cmd2, but the second version runs cmd2 upon rebase --continue.
>
> The updated documentation should not say that the two are "equivalent".

Fair'nuf.  Thansk.

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 179ab77..2d71e4b 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -358,7 +358,7 @@ with several commands:
 +
 	git rebase -i --exec "cmd1 && cmd2 && ..."
 +
-or equivalently by giving more than one `--exec`:
+or by giving more than one `--exec`:
 +
 	git rebase -i --exec "cmd1" --exec "cmd2" --exec ...
 +