From: Stephen Boyd <bebarino@gmail.com>
To: Bryan Alves <bryanalves@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] merge: --no-ff configuration setting
Date: Mon, 22 Feb 2010 21:55:26 -0800 [thread overview]
Message-ID: <4B836DCE.7010606@gmail.com> (raw)
In-Reply-To: <1266807555-86199-1-git-send-email-bryanalves@gmail.com>
On 02/21/2010 06:59 PM, Bryan Alves wrote:
> Add a new configuration option, merge.allowfastforward
>
> When set to false, causes --no-ff to be the default behavior
> for merges. When set to true, or not present, the default
> behavior is unchanged, and acts like --ff is set.
The subject says --no-ff configuration but the option is for --ff.
Sounds confusing. In other words, shouldn't it be
merge.disallowfastforward or merge.nofastforward? Or maybe the subject
should be "merge: --ff configuration setting"
Also could you just use branch.<name>.mergeoptions and not introduce yet
another config option? Or maybe there's some reasoning why you always
want to have merge commits in your workflow?
Finally if this goes in please add a description to Documentation/config.txt
next prev parent reply other threads:[~2010-02-23 5:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-22 2:59 [PATCH] merge: --no-ff configuration setting Bryan Alves
2010-02-23 5:55 ` Stephen Boyd [this message]
2010-02-23 6:32 ` 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=4B836DCE.7010606@gmail.com \
--to=bebarino@gmail.com \
--cc=bryanalves@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.