From: Junio C Hamano <gitster@pobox.com>
To: Jari Aalto <jari.aalto@cante.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option
Date: Tue, 05 Feb 2008 18:26:32 -0800 [thread overview]
Message-ID: <7vmyqe6crr.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <d4rbzevi.fsf@blue.sea.net> (Jari Aalto's message of "Tue, 05 Feb 2008 15:56:01 +0200")
Jari Aalto <jari.aalto@cante.net> writes:
> Honor user settable --whitespace=<control>
>
> Signed-off-by: Jari Aalto <jari.aalto AT cante.net>
> ---
> git-rebase.sh | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/git-rebase.sh b/git-rebase.sh
> index bdcea0e..ec052c4 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -174,7 +174,8 @@ do
> head_name=$(cat .dotest/head-name) &&
> onto=$(cat .dotest/onto) &&
> orig_head=$(cat .dotest/orig-head) &&
> - git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
> + git am $git_am_opt --resolved --3way \
> + --resolvemsg="$RESOLVEMSG" &&
> move_to_original_branch
> exit
> ;;
Actually this is a bug in git-am. am is supposed to remember
the original command line options.
8c31cb8 (git-am: --whitespace=x option) does it correctly, but
later 67dad68 (add -C[NUM] to git-am) broke it and other changes
inherited the breakage.
prev parent reply other threads:[~2008-02-06 2:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-05 13:56 [PATCH] git-rebase.sh: Read $git_am_opt user setting inside --continue option Jari Aalto
2008-02-06 2:26 ` 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=7vmyqe6crr.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jari.aalto@cante.net \
/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).