From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 28 May 2018 12:56:52 GMT
Subject: Re: [PATCH] git-rebase--interactive: fix copy-paste mistake
Message-ID: <nycvar.QRO.7.76.6.1805281455210.82@tvgsbejvaqbjf.bet>
In-Reply-To: <CAGHpTBLGmApTGsjeP2d93CWH=OWBXmbPdRrGxaobFRcSjUiuYw@mail.gmail.com>

Hi Orgad,

On Sun, 27 May 2018, Orgad Shaneh wrote:

> exec argument is a command, not a commit.
> 
> Signed-off-by: Orgad Shaneh <orgads@gmail.com>
> ---
>   git-rebase--interactive.sh | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index cbf44f8648..85a72b933e 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -160,7 +160,7 @@ r, reword <commit> = use commit, but edit the commit
> message
>   e, edit <commit> = use commit, but stop for amending
>   s, squash <commit> = use commit, but meld into previous commit
>   f, fixup <commit> = like \"squash\", but discard this commit's log message
> -x, exec <commit> = run command (the rest of the line) using shell
> +x, exec <command> = run command (the rest of the line) using shell

Apart from the white-space (which I *think* might make `git apply` barf on
this diff), this looks obviously correct to me.

To make it easier for Junio, maybe you can provide a link to a branch in a
public repository, ready to be fetched?

>   d, drop <commit> = remove commit
>   l, label <label> = label current HEAD with a name
>   t, reset <label> = reset HEAD to a label
> -- 
> 2.17.0.windows.1

Thank you for cleaning up my mess,
Dscho