git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Nikolay Borisov <nik.borisov@suse.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] rebase: Fix documentation about used shell in -x
Date: Wed, 17 Jan 2024 14:38:39 -0800	[thread overview]
Message-ID: <xmqqr0iftwk0.fsf@gitster.g> (raw)
In-Reply-To: <20240117085347.948960-1-nik.borisov@suse.com> (Nikolay Borisov's message of "Wed, 17 Jan 2024 10:53:47 +0200")

Nikolay Borisov <nik.borisov@suse.com> writes:

> The shell used when using the -x option is erroneously documented to be
> the one pointed to by the $SHELL environmental variable. This was true
> when rebase was implemented as a shell script but this is no longer
> true.
>
> Signed-off-by: Nikolay Borisov <nik.borisov@suse.com>
> ---

Ah, our mails crossed, and this is much better than my "tentative"
one.  Let me replace it with this one and queue.

Thanks.

>  Documentation/git-rebase.txt | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index 25516c45d8b8..2cd55aedc0f9 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -963,10 +963,9 @@ The interactive rebase will stop when a command fails (i.e. exits with
>  non-0 status) to give you an opportunity to fix the problem. You can
>  continue with `git rebase --continue`.
>
> -The "exec" command launches the command in a shell (the one specified
> -in `$SHELL`, or the default shell if `$SHELL` is not set), so you can
> -use shell features (like "cd", ">", ";" ...). The command is run from
> -the root of the working tree.
> +The "exec" command launches the command in a shell (the default one, usually
> +/bin/sh), so you can use shell features (like "cd", ">", ";" ...). The command
> +is run from the root of the working tree.
>
>  ----------------------------------
>  $ git rebase -i --exec "make test"
> --
> 2.34.1

      reply	other threads:[~2024-01-17 22:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-17  8:53 [PATCH v2] rebase: Fix documentation about used shell in -x Nikolay Borisov
2024-01-17 22:38 ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqr0iftwk0.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=nik.borisov@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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 NNTP newsgroup(s).