From: "Ferry Huberts (Pelagic)" <ferry.huberts@pelagic•nl>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org, "Shawn O. Pearce" <spearce@spearce•org>,
David Aguilar <davvid@gmail•com>,
Markus Heidelberg <markus.heidelberg@web•de>,
Charles Bailey <charles@hashpling•org>
Subject: Re: [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git
Date: Sun, 12 Apr 2009 09:04:02 +0200 [thread overview]
Message-ID: <49E19262.7090802@pelagic.nl> (raw)
In-Reply-To: <7v4owvdju6.fsf@gitster.siamese.dyndns.org>
Junio C Hamano wrote:
> "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
prev parent reply other threads:[~2009-04-12 7:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-10 19:33 [PATCH v3 1/2] Ensure consistent usage of mergetool.keepBackup in git-gui Ferry Huberts
2009-04-10 19:33 ` [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git Ferry Huberts
2009-04-11 19:23 ` Junio C Hamano
2009-04-11 19:41 ` Ferry Huberts (Pelagic)
2009-04-11 19:44 ` Ferry Huberts (Pelagic)
2009-04-11 20:19 ` Junio C Hamano
2009-04-12 7:04 ` Ferry Huberts (Pelagic) [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=49E19262.7090802@pelagic.nl \
--to=ferry.huberts@pelagic$(echo .)nl \
--cc=charles@hashpling$(echo .)org \
--cc=davvid@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=markus.heidelberg@web$(echo .)de \
--cc=spearce@spearce$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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