git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: "SZEDER Gábor" <szeder@ira.uka.de>, git@vger.kernel.org
Subject: Re: [PATCH v2] bash: add missing 'git merge' options
Date: Mon, 16 Feb 2009 18:24:12 -0800	[thread overview]
Message-ID: <7vmyclby2b.fsf@gitster.siamese.dyndns.org> (raw)
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.

      reply	other threads:[~2009-02-17  2:25 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
2009-02-17  2:24       ` Junio C Hamano [this message]

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=7vmyclby2b.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=spearce@spearce.org \
    --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).