From: "Shawn O. Pearce" <spearce@spearce.org>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH v2] bash: add missing 'git merge' options
Date: Mon, 16 Feb 2009 07:56:46 -0800 [thread overview]
Message-ID: <20090216155646.GB18525@spearce.org> (raw)
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.
next prev parent reply other threads:[~2009-02-16 15:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2009-02-17 2:24 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090216155646.GB18525@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder@ira.uka.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).