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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 23, 2010, 06:32 UTC
Message-ID
<7vljekbgyd.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1266807555-86199-1-git-send-email-bryanalves@gmail.com>
Bryan Alves <bryanalves@gmail.com> writes:
>  Documentation/merge-options.txt |    4 +++-
>  builtin-merge.c                 |    3 +++

This needs tests to make sure that existing programs that internally use "git merge" (e.g. "rebase -m", "rebase -i") do not break when the end user has this configuration set in the repository, in addition to that "merge" works as expected with and without this configuration variable, with combinations with the use of relevant command line options.

Previous: Stephen Boyd
Message 3 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.