git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] merge: --no-ff configuration setting

From
Stephen Boyd <bebarino@gmail.com>
Date
Feb 23, 2010, 05:55 UTC
Message-ID
<4B836DCE.7010606@gmail.com>
In-Reply-To
<1266807555-86199-1-git-send-email-bryanalves@gmail.com>
On 02/21/2010 06:59 PM, Bryan Alves wrote:
Show 5 quoted lines
> 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
Previous: Bryan AlvesNext: Junio C Hamano
Message 2 of 3 in “merge: --no-ff configuration setting”
  1. merge: --no-ff configuration settingBryan Alves, Feb 22, 2010
  2. Stephen BoydFeb 23, 2010
  3. Junio C HamanoFeb 23, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.