![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 31 Oct 2006 01:17:41 +0000 (17:17 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 31 Oct 2006 01:17:41 +0000 (17:17 -0800) | ||
| commit | f69e743d97cdb3f6647ea0620a22311e7bf36051 | |
| tree | ec77a161ca08db652ddead00df9cda210f09e2d4 | tree | snapshot |
| parent | ae86ad65757b857337f10f25ff31cb3348d3943d | commit | diff |
git-pickaxe: split find_origin() into find_rename() and find_origin().
When a merge adds a new file from the second parent, the
earlier code tried to find renames in the first parent before
noticing that the vertion from the second parent was added
without modification.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When a merge adds a new file from the second parent, the
earlier code tried to find renames in the first parent before
noticing that the vertion from the second parent was added
without modification.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| builtin-pickaxe.c | diff | blob | history |