* [PATCH] bash: add 'merge --ff' and '--no-ff' options
@ 2009-02-14 16:22 SZEDER Gábor
2009-02-15 5:34 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: SZEDER Gábor @ 2009-02-14 16:22 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git, SZEDER Gábor
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] bash: add 'merge --ff' and '--no-ff' options
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
2009-02-15 13:25 ` [PATCH v2] bash: add missing 'git merge' options SZEDER Gábor
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2009-02-15 5:34 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: Shawn O. Pearce, git
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] bash: add missing 'git merge' options
2009-02-15 5:34 ` Junio C Hamano
@ 2009-02-15 13:25 ` SZEDER Gábor
2009-02-16 15:56 ` Shawn O. Pearce
0 siblings, 1 reply; 5+ messages in thread
From: SZEDER Gábor @ 2009-02-15 13:25 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Shawn O. Pearce, git, SZEDER Gábor
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] bash: add missing 'git merge' options
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
0 siblings, 1 reply; 5+ messages in thread
From: Shawn O. Pearce @ 2009-02-16 15:56 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: Junio C Hamano, git
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] bash: add missing 'git merge' options
2009-02-16 15:56 ` Shawn O. Pearce
@ 2009-02-17 2:24 ` Junio C Hamano
0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2009-02-17 2:24 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: SZEDER Gábor, git
"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.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-02-17 2:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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
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).