Thread (11 messages) flat view 11 messages, 4 authors, 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:49:38

Possibly related (same subject, not in this thread)

Kevin Ballard [off-list ref] writes:
quoted
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?
You mean so you can type `git diff --rename-score=50% foo`? A reasonable
suggestion, but then what do we do with -B and -C? It doesn't make much
sense to give a longer name to only one of the three options. This patch
was concerned with simply exposing the functionality to the merge
strategy and doesn't attempt to address the problem of providing long
names for this trio of options.
I would call them --break-threshold and --copy-threshold respectively.

I have been happy without long option names when we originally had only
short names, but some people seem to be able to be more explicit, so...

While we are at it, would it make sense to have "merge-recursive -M20" as
a shorthand as well?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help