| commit | 3f231e235fb4b9c4d937a50fa4fbf35f9ed10387 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Apr 2012 17:35:33 +0000 (26 10:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Apr 2012 17:35:33 +0000 (26 10:35 -0700) | ||
| tree | 6f064ed970aa6363222824e2899681c383544c2d | treesnapshot (tar.gz zip) |
| parent | 10a20b43c3d03ea1fab9095f96eda66086d3dcd2 | commitdiff |
| parent | 4f7cb99ada26be5d86402a6e060f3ee16a672f16 | commitdiff |
Merge branch 'jk/diff-no-rename-empty' into maint
Rename detection logic used to match two empty files as renames during
merge-recursive, leading unnatural mismerges.
By Jeff King
* jk/diff-no-rename-empty:
merge-recursive: don't detect renames of empty files
teach diffcore-rename to optionally ignore empty content
make is_empty_blob_sha1 available everywhere
drop casts from users EMPTY_TREE_SHA1_BIN
Rename detection logic used to match two empty files as renames during
merge-recursive, leading unnatural mismerges.
By Jeff King
* jk/diff-no-rename-empty:
merge-recursive: don't detect renames of empty files
teach diffcore-rename to optionally ignore empty content
make is_empty_blob_sha1 available everywhere
drop casts from users EMPTY_TREE_SHA1_BIN
| cache.h | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |