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

Re: [PATCH] merge-recursive: option to specify rename threshold

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 27, 2010, 04:11 UTC
Message-ID
<7vk4m7n7uo.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1285202724-52474-1-git-send-email-kevin@sb.org>
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?

Previous: Kevin BallardNext: Kevin Ballard
Message 5 of 18 in “merge-recursive: option to specify rename threshold”
  1. merge-recursive: option to specify rename thresholdKevin Ballard, Sep 22, 2010
  2. merge-recursive: option to specify rename thresholdKevin Ballard, Sep 23, 2010
  3. Kevin BallardSep 23, 2010
  4. merge-recursive: option to specify rename thresholdKevin Ballard, Sep 23, 2010
  5. Junio C HamanoSep 27, 2010
  6. Kevin BallardSep 27, 2010
  7. Junio C HamanoSep 27, 2010
  8. Kevin BallardSep 27, 2010
  9. Junio C HamanoSep 27, 2010
  10. Kevin BallardSep 27, 2010
  11. Jonathan NiederSep 27, 2010
  12. Kevin BallardSep 28, 2010
  13. Jonathan NiederSep 28, 2010
  14. Kevin BallardSep 28, 2010
  15. Jonathan NiederSep 28, 2010
  16. 1/2 merge-recursive: option to specify rename thresholdKevin Ballard, Sep 27, 2010
  17. 2/2 diff: add synonyms for -M, -C, -BKevin Ballard, Sep 27, 2010
  18. Thell FowlerSep 28, 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.