# [PATCH] bash: add 'merge --ff' and '--no-ff' options

5 messages from 2009-02-14 to 2009-02-17. Participants: SZEDER Gábor, Junio C Hamano, Shawn O. Pearce.
Thread: https://gitlist.dev/t/17792

## SZEDER Gábor, 2009-02-14 16:22

Subject: [PATCH] bash: add 'merge --ff' and '--no-ff' options
Message-ID: <1234628576-4686-1-git-send-email-szeder@ira.uka.de>
URL: https://gitlist.dev/e/1234628576-4686-1-git-send-email-szeder%40ira.uka.de

```
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
-- 
1.6.2.rc0.111.g246ed

```

## Junio C Hamano, 2009-02-15 05:34

Subject: Re: [PATCH] bash: add 'merge --ff' and '--no-ff' options
Message-ID: <7v7i3sp8jk.fsf@gitster.siamese.dyndns.org>
URL: https://gitlist.dev/e/7v7i3sp8jk.fsf%40gitster.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.

```

## SZEDER Gábor, 2009-02-15 13:25

Subject: [PATCH v2] bash: add missing 'git merge' options
Message-ID: <1234704311-14774-1-git-send-email-szeder@ira.uka.de>
URL: https://gitlist.dev/e/1234704311-14774-1-git-send-email-szeder%40ira.uka.de
In-Reply-To: <7v7i3sp8jk.fsf@gitster.siamese.dyndns.org>

```
Namely: '--commit', '--stat', '--no-squash', '--ff', '--no-ff'.

One might wonder why add options that specify the default behaviour
anyway (e.g. '--commit', '--no-squash', etc.).  Users can override the
default with config options (e.g. 'branch.<name>.mergeoptions',
'merge.log'), but sometimes might still need the default behaviour.

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..98fa56e 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
+			--commit --stat --no-squash --ff --no-ff
 			"
 		return
 	esac
-- 
1.6.2.rc0.112.gc888f

```

## Shawn O. Pearce, 2009-02-16 15:56

Subject: Re: [PATCH v2] bash: add missing 'git merge' options
Message-ID: <20090216155646.GB18525@spearce.org>
URL: https://gitlist.dev/e/20090216155646.GB18525%40spearce.org
In-Reply-To: <1234704311-14774-1-git-send-email-szeder@ira.uka.de>

```
SZEDER Gábor <szeder@ira.uka.de> wrote:
> Namely: '--commit', '--stat', '--no-squash', '--ff', '--no-ff'.
> 
> One might wonder why add options that specify the default behaviour
> anyway (e.g. '--commit', '--no-squash', etc.).  Users can override the
> default with config options (e.g. 'branch.<name>.mergeoptions',
> 'merge.log'), but sometimes might still need the default behaviour.
> 
> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
> ---

Acked-by: Shawn O. Pearce <spearce@spearce.org>

>  contrib/completion/git-completion.bash |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

-- 
Shawn.

```

## Junio C Hamano, 2009-02-17 02:24

Subject: Re: [PATCH v2] bash: add missing 'git merge' options
Message-ID: <7vmyclby2b.fsf@gitster.siamese.dyndns.org>
URL: https://gitlist.dev/e/7vmyclby2b.fsf%40gitster.siamese.dyndns.org
In-Reply-To: <20090216155646.GB18525@spearce.org>

```
"Shawn O. Pearce" <spearce@spearce.org> writes:

> SZEDER Gábor <szeder@ira.uka.de> wrote:
>> Namely: '--commit', '--stat', '--no-squash', '--ff', '--no-ff'.
>> 
>> One might wonder why add options that specify the default behaviour
>> anyway (e.g. '--commit', '--no-squash', etc.).  Users can override the
>> default with config options (e.g. 'branch.<name>.mergeoptions',
>> 'merge.log'), but sometimes might still need the default behaviour.
>> 
>> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
>> ---
>
> Acked-by: Shawn O. Pearce <spearce@spearce.org>

Thanks, both.

```