* [PATCH 0/3] Git rename detection improvements
@ 2011-02-19 4:22 Linus Torvalds
2011-02-19 6:57 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Linus Torvalds @ 2011-02-19 4:22 UTC (permalink / raw)
To: Junio C Hamano, Git Mailing List
Ok, so this is a cleaned-up series of three commits that I think are
worthy of being considered for inclusion. They're against current
master, maybe I should have done it against pu or next, but I doubt it
really clashes with anything, since the code hasn't changed recently
afaik.
Linus
---
Linus Torvalds (3):
for_each_hash: allow passing a 'void *data' pointer to callback
diffcore-rename: propler honor the difference between -M and -C
diffcore-rename: improve estimate_similarity() heuristics
builtin/describe.c | 4 +-
diffcore-rename.c | 69 ++++++++++++++++++++-------------------
hash.c | 4 +-
hash.h | 2 +-
t/t4003-diff-rename-1.sh | 2 +-
t/t4004-diff-rename-symlink.sh | 2 +-
t/t4005-diff-rename-2.sh | 2 +-
t/t4008-diff-break-rewrite.sh | 4 +-
t/t4009-diff-rename-4.sh | 2 +-
9 files changed, 46 insertions(+), 45 deletions(-)
--
1.7.4.1.51.g2bf8a
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 0/3] Git rename detection improvements
2011-02-19 4:22 [PATCH 0/3] Git rename detection improvements Linus Torvalds
@ 2011-02-19 6:57 ` Junio C Hamano
2011-02-19 15:31 ` Linus Torvalds
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2011-02-19 6:57 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Git Mailing List
Linus Torvalds <torvalds@linux-foundation.org> writes:
> Ok, so this is a cleaned-up series of three commits that I think are
> worthy of being considered for inclusion.
Thanks; they all look very sane. There indeed is a small conflict with a
topic in 'pu', but the resolution is straightforward.
> Linus Torvalds (3):
> for_each_hash: allow passing a 'void *data' pointer to callback
> diffcore-rename: propler honor the difference between -M and -C
> diffcore-rename: improve estimate_similarity() heuristics
I would suggest s/propler/properly/, though...
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 0/3] Git rename detection improvements
2011-02-19 6:57 ` Junio C Hamano
@ 2011-02-19 15:31 ` Linus Torvalds
0 siblings, 0 replies; 3+ messages in thread
From: Linus Torvalds @ 2011-02-19 15:31 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List
On Fri, Feb 18, 2011 at 10:57 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
> I would suggest s/propler/properly/, though...
Hey, if you don't like my creative spelling... Snif.
Linus
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-19 15:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-19 4:22 [PATCH 0/3] Git rename detection improvements Linus Torvalds
2011-02-19 6:57 ` Junio C Hamano
2011-02-19 15:31 ` Linus Torvalds
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).