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

Re: [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git

From
Ferry Huberts (Pelagic) <ferry.huberts@pelagic.nl>
Date
Apr 12, 2009, 07:04 UTC
Message-ID
<49E19262.7090802@pelagic.nl>
In-Reply-To
<7v4owvdju6.fsf@gitster.siamese.dyndns.org>
Junio C Hamano wrote:
Show 29 quoted lines
> "Ferry Huberts (Pelagic)" <ferry.huberts@pelagic.nl> writes:
> 
>> Ferry Huberts (Pelagic) wrote:
>>> Junio C Hamano wrote:
>>>> Ferry Huberts <ferry.huberts@pelagic.nl> writes:
>>>>
>>>>> In several places merge.keepBackup is used i.s.o.
>>>>> mergetool.keepBackup. This patch makes it all
>>>>> consistent for git
>>>> A silly question.  The above makes it sound as if both merge.keepBackup
>>>> and mergetool.keepBackup are valid, but the latter is preferred, and your
>>>> patch makes things consistent even though without it there is nothing
>>>> broken per-se.
>>>>
>>>> Is that really is the case?
>>>>
>>>> Otherwise, perhaps the title and the message should read like this:
>>>>
>>>>     Fix misspelled mergetool.keepBackup
>>>>     
>>>>     In several places mergetool.keepBackup was misspelled as merge.keepBackup.
>>>>     
>>>>     Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
>>> feel free to change it :-)
> 
> Notice that I didn't follow the discussion closely, and I am asking if
> this is a "bugfix" or "changing for consistency even though there is no
> breakage".
> 

it's the latter. summary: docs say mergetool.keepBackup. code does merge.keepBackup

Previous: Junio C Hamano
Message 7 of 7 in “Ensure consistent usage of mergetool.keepBackup in git-gui”
  1. 1/2 Ensure consistent usage of mergetool.keepBackup in git-guiFerry Huberts, Apr 10, 2009
  2. 2/2 Ensure consistent usage of mergetool.keepBackup in gitFerry Huberts, Apr 10, 2009
  3. Junio C HamanoApr 11, 2009
  4. Ferry Huberts (Pelagic)Apr 11, 2009
  5. Ferry Huberts (Pelagic)Apr 11, 2009
  6. Junio C HamanoApr 11, 2009
  7. Ferry Huberts (Pelagic)Apr 12, 2009

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.