git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, git@vger.kernel.org
Subject: Re: [PATCH] bash: add 'merge --ff' and '--no-ff' options
Date: Sat, 14 Feb 2009 21:34:55 -0800	[thread overview]
Message-ID: <7v7i3sp8jk.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1234628576-4686-1-git-send-email-szeder@ira.uka.de> (SZEDER Gábor's message of "Sat, 14 Feb 2009 17:22:56 +0100")

SZEDER Gábor <szeder@ira.uka.de> writes:

> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
> ---
>  contrib/completion/git-completion.bash |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index e848d5d..ad45717 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1037,6 +1037,7 @@ _git_merge ()
>  	--*)
>  		__gitcomp "
>  			--no-commit --no-stat --log --no-log --squash --strategy
> +			--ff --no-ff
>  			"
>  		return
>  	esac

I do not have objections to the patch per-se, but it made me stop thinking
for 2 minutes why there is --no-ff listed but not --no-squash, and I gave
up, not being able to figure out why.

  reply	other threads:[~2009-02-15  5:36 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-14 16:22 [PATCH] bash: add 'merge --ff' and '--no-ff' options SZEDER Gábor
2009-02-15  5:34 ` Junio C Hamano [this message]
2009-02-15 13:25   ` [PATCH v2] bash: add missing 'git merge' options SZEDER Gábor
2009-02-16 15:56     ` Shawn O. Pearce
2009-02-17  2:24       ` Junio C Hamano

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=7v7i3sp8jk.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=spearce@spearce.org \
    --cc=szeder@ira.uka.de \
    /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).