From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 15 Feb 2009 05:34:55 GMT
Subject: Re: [PATCH] bash: add 'merge --ff' and '--no-ff' options
Message-ID: <7v7i3sp8jk.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1234628576-4686-1-git-send-email-szeder@ira.uka.de>

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.