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

From: Orgad Shaneh <orgads@gmail.com>
Date: May 28, 2018, 13:16 UTC
Message-ID: <CAGHpTBK-=Q51m37GYJOD4D8wLAOcg=nXD4H8GMfPnDJh8Ld4Yw@mail.gmail.com>
In-Reply-To: <nycvar.QRO.7.76.6.1805281455210.82@tvgsbejvaqbjf.bet>

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

> Hi Orgad,

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

Show 16 quoted lines

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

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