projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 10a20b4 4f7cb99)
Merge branch 'jk/diff-no-rename-empty' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:33 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:33 +0000 (10:35 -0700)
commit3f231e235fb4b9c4d937a50fa4fbf35f9ed10387
tree6f064ed970aa6363222824e2899681c383544c2dtree | snapshot
parent10a20b43c3d03ea1fab9095f96eda66086d3dcd2commit | diff
parent4f7cb99ada26be5d86402a6e060f3ee16a672f16commit | diff
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
cache.h diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
Git—the stupid content tracker