{"thread":{"id":"17792","subject":"[PATCH] bash: add 'merge --ff' and '--no-ff' options","startedAt":"2009-02-14T16:22:56Z","lastAt":"2009-02-17T02:24:12Z","messageCount":5,"participants":["SZEDER Gábor","Junio C Hamano","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"104648","messageId":"1234628576-4686-1-git-send-email-szeder@ira.uka.de","threadId":"17792","inReplyTo":null,"subject":"[PATCH] bash: add 'merge --ff' and '--no-ff' options","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2009-02-14T16:22:56Z","receivedAt":"2009-02-14T16:22:56Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"Signed-off-by: SZEDER Gábor \n---\n contrib/completion/git-completion.bash | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex e848d5d..ad45717 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1037,6 +1037,7 @@ _git_merge ()\n \t--*)\n \t\t__gitcomp \"\n \t\t\t--no-commit --no-stat --log --no-log --squash --strategy\n+\t\t\t--ff --no-ff\n \t\t\t\"\n \t\treturn\n \tesac\n-- \n1.6.2.rc0.111.g246ed\n"},{"id":"104731","messageId":"7v7i3sp8jk.fsf@gitster.siamese.dyndns.org","threadId":"17792","inReplyTo":"1234628576-4686-1-git-send-email-szeder@ira.uka.de","subject":"Re: [PATCH] bash: add 'merge --ff' and '--no-ff' options","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-02-15T05:34:55Z","receivedAt":"2009-02-15T05:34:55Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"SZEDER Gábor writes:\n\n> Signed-off-by: SZEDER Gábor \n> ---\n> contrib/completion/git-completion.bash | 1 +\n> 1 files changed, 1 insertions(+), 0 deletions(-)\n>\n> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\n> index e848d5d..ad45717 100755\n> --- a/contrib/completion/git-completion.bash\n> +++ b/contrib/completion/git-completion.bash\n> @@ -1037,6 +1037,7 @@ _git_merge ()\n> \t--*)\n> \t\t__gitcomp \"\n> \t\t\t--no-commit --no-stat --log --no-log --squash --strategy\n> +\t\t\t--ff --no-ff\n> \t\t\t\"\n> \t\treturn\n> \tesac\n\nI do not have objections to the patch per-se, but it made me stop thinking\nfor 2 minutes why there is --no-ff listed but not --no-squash, and I gave\nup, not being able to figure out why.\n"},{"id":"104772","messageId":"1234704311-14774-1-git-send-email-szeder@ira.uka.de","threadId":"17792","inReplyTo":"7v7i3sp8jk.fsf@gitster.siamese.dyndns.org","subject":"[PATCH v2] bash: add missing 'git merge' options","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2009-02-15T13:25:11Z","receivedAt":"2009-02-15T13:25:11Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"Namely: '--commit', '--stat', '--no-squash', '--ff', '--no-ff'.\n\nOne might wonder why add options that specify the default behaviour\nanyway (e.g. '--commit', '--no-squash', etc.). Users can override the\ndefault with config options (e.g. 'branch..mergeoptions',\n'merge.log'), but sometimes might still need the default behaviour.\n\nSigned-off-by: SZEDER Gábor \n---\n contrib/completion/git-completion.bash | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex e848d5d..98fa56e 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1037,6 +1037,7 @@ _git_merge ()\n \t--*)\n \t\t__gitcomp \"\n \t\t\t--no-commit --no-stat --log --no-log --squash --strategy\n+\t\t\t--commit --stat --no-squash --ff --no-ff\n \t\t\t\"\n \t\treturn\n \tesac\n-- \n1.6.2.rc0.112.gc888f\n"},{"id":"104962","messageId":"20090216155646.GB18525@spearce.org","threadId":"17792","inReplyTo":"1234704311-14774-1-git-send-email-szeder@ira.uka.de","subject":"Re: [PATCH v2] bash: add missing 'git merge' options","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-02-16T15:56:46Z","receivedAt":"2009-02-16T15:56:46Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"SZEDER Gábor wrote:\n> Namely: '--commit', '--stat', '--no-squash', '--ff', '--no-ff'.\n> \n> One might wonder why add options that specify the default behaviour\n> anyway (e.g. '--commit', '--no-squash', etc.). Users can override the\n> default with config options (e.g. 'branch..mergeoptions',\n> 'merge.log'), but sometimes might still need the default behaviour.\n> \n> Signed-off-by: SZEDER Gábor \n> ---\n\nAcked-by: Shawn O. Pearce \n\n> contrib/completion/git-completion.bash | 1 +\n> 1 files changed, 1 insertions(+), 0 deletions(-)\n\n-- \nShawn.\n"},{"id":"105058","messageId":"7vmyclby2b.fsf@gitster.siamese.dyndns.org","threadId":"17792","inReplyTo":"20090216155646.GB18525@spearce.org","subject":"Re: [PATCH v2] bash: add missing 'git merge' options","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-02-17T02:24:12Z","receivedAt":"2009-02-17T02:24:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Shawn O. Pearce\" writes:\n\n> SZEDER Gábor wrote:\n>> Namely: '--commit', '--stat', '--no-squash', '--ff', '--no-ff'.\n>> \n>> One might wonder why add options that specify the default behaviour\n>> anyway (e.g. '--commit', '--no-squash', etc.). Users can override the\n>> default with config options (e.g. 'branch..mergeoptions',\n>> 'merge.log'), but sometimes might still need the default behaviour.\n>> \n>> Signed-off-by: SZEDER Gábor \n>> ---\n>\n> Acked-by: Shawn O. Pearce \n\nThanks, both.\n"}]}