Re: [PATCH] git-rebase--interactive: fix copy-paste mistake

[Orgad Shaneh]

On Mon, May 28, 2018 at 3:56 PM Johannes Schindelin <
johannes.schinde...@gmx.de> wrote:

> Hi Orgad,

> On Sun, 27 May 2018, Orgad Shaneh wrote:

> > exec argument is a command, not a commit.
> >
> > Signed-off-by: Orgad Shaneh 
> > ---
> >   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  = 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 (the rest of the line) using shell
> > +x, exec  = 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.

I'm behind a firewall, so I just pasted the patch in gmail, hoping it will
pass correctly :)

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

Pushed to https://github.com/orgads/git -> exec-description branch.

> Thank you for cleaning up my mess,

No prob :)

- Orgad

Re: [PATCH] git-rebase--interactive: fix copy-paste mistake

[Johannes Schindelin]

Hi Orgad,

On Sun, 27 May 2018, Orgad Shaneh wrote:

> exec argument is a command, not a commit.
> 
> Signed-off-by: Orgad Shaneh 
> ---
>   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  = 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 (the rest of the line) using shell
> +x, exec  = 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  = remove commit
>   l, label  = label current HEAD with a name
>   t, reset  = reset HEAD to a label
> -- 
> 2.17.0.windows.1

Thank you for cleaning up my mess,
Dscho