diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:35:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-26 10:35:33 -0700 |
| commit | 3f231e235fb4b9c4d937a50fa4fbf35f9ed10387 (patch) | |
| tree | 6f064ed970aa6363222824e2899681c383544c2d /builtin/commit.c | |
| parent | Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint (diff) | |
| parent | merge-recursive: don't detect renames of empty files (diff) | |
| download | git-3f231e235fb4b9c4d937a50fa4fbf35f9ed10387.tar.gz git-3f231e235fb4b9c4d937a50fa4fbf35f9ed10387.zip | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions