From: Junio C Hamano <gitster@pobox.com>
To: Kevin Ballard <kevin@sb.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge-recursive: option to specify rename threshold
Date: Sun, 26 Sep 2010 21:11:43 -0700 [thread overview]
Message-ID: <7vk4m7n7uo.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1285202724-52474-1-git-send-email-kevin@sb.org> (Kevin Ballard's message of "Wed\, 22 Sep 2010 17\:45\:24 -0700")
Kevin Ballard <kevin@sb.org> writes:
> The recursive merge strategy turns on rename detection but leaves the
> rename score at the default. Add a strategy option to allow the user
> to specify a rename score to use.
Sounds straightforward, except that Documentation/diff-options.txt seems
to call the number associated with -M "threshold", not "score". The title
of the patch incidentally says threshold as well ;-)
At the end-user level, this new option to merge-recursive has exactly the
same meaning as existing -M given to "diff" family; people would probably
want to see it made available as a synonym to "diff" family as well, no?
next prev parent reply other threads:[~2010-09-27 4:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-22 6:03 [WIP/PATCH] merge-recursive: option to specify rename threshold Kevin Ballard
2010-09-23 0:32 ` [PATCH] " Kevin Ballard
2010-09-23 0:38 ` Kevin Ballard
2010-09-23 0:45 ` Kevin Ballard
2010-09-27 4:11 ` Junio C Hamano [this message]
2010-09-27 5:04 ` Kevin Ballard
2010-09-27 5:24 ` Junio C Hamano
2010-09-27 5:34 ` Kevin Ballard
2010-09-27 6:04 ` Junio C Hamano
2010-09-27 22:01 ` Kevin Ballard
2010-09-27 23:53 ` Jonathan Nieder
2010-09-28 0:01 ` Kevin Ballard
2010-09-28 0:08 ` Jonathan Nieder
2010-09-28 0:14 ` Kevin Ballard
2010-09-28 0:24 ` Jonathan Nieder
2010-09-27 23:58 ` [PATCHv2 1/2] " Kevin Ballard
2010-09-27 23:58 ` [PATCHv2 2/2] diff: add synonyms for -M, -C, -B Kevin Ballard
2010-09-28 21:15 ` Thell Fowler
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=7vk4m7n7uo.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=kevin@sb.org \
/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.