* [PATCH] git-rebase--interactive: fix copy-paste mistake
@ 2018-05-27 6:51 Orgad Shaneh
2018-05-28 12:56 ` Johannes Schindelin
0 siblings, 1 reply; 3+ messages in thread
From: Orgad Shaneh @ 2018-05-27 6:51 UTC (permalink / raw)
To: git
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
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] git-rebase--interactive: fix copy-paste mistake
2018-05-27 6:51 [PATCH] git-rebase--interactive: fix copy-paste mistake Orgad Shaneh
@ 2018-05-28 12:56 ` Johannes Schindelin
2018-05-28 13:16 ` Orgad Shaneh
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Schindelin @ 2018-05-28 12:56 UTC (permalink / raw)
To: Orgad Shaneh; +Cc: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] git-rebase--interactive: fix copy-paste mistake
2018-05-28 12:56 ` Johannes Schindelin
@ 2018-05-28 13:16 ` Orgad Shaneh
0 siblings, 0 replies; 3+ messages in thread
From: Orgad Shaneh @ 2018-05-28 13:16 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
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:
> > 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-28 13:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-27 6:51 [PATCH] git-rebase--interactive: fix copy-paste mistake Orgad Shaneh
2018-05-28 12:56 ` Johannes Schindelin
2018-05-28 13:16 ` Orgad Shaneh
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).