threads / patch / 17792

patchbash: add 'merge --ff' and '--no-ff' options

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

## tl;dr

5 messages between Feb 14, 2009 and Feb 17, 2009. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

SZEDER Gábor· Feb 14, 2009, 16:22 UTC · lore

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 contrib/completion/git-completion.bash |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Show changes to contrib/completion/git-completion.bash +1 −0

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· Feb 15, 2009, 05:34 UTC · re: SZEDER Gábor · lore

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

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

Show 17 quoted lines

> 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· Feb 15, 2009, 13:25 UTC · re: Junio C Hamano · lore

[PATCH v2] bash: add missing 'git merge' options

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(-)

Show changes to contrib/completion/git-completion.bash +1 −0

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· Feb 16, 2009, 15:56 UTC · re: SZEDER Gábor · lore

Re: [PATCH v2] bash: add missing 'git merge' options

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

Show 9 quoted lines

> 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· Feb 17, 2009, 02:24 UTC · re: Shawn O. Pearce · lore

Re: [PATCH v2] bash: add missing 'git merge' options

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

Show 12 quoted lines

> 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.