]> rtime.felk.cvut.cz Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b659f81 5304810)
Merge branch 'jk/diff-files-assume-unchanged' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:47:09 +0000 (11:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:47:09 +0000 (11:47 -0700)
"git diff --find-copies-harder" sometimes pretended as if the mode
bits have changed for paths that are marked with assume-unchanged
bit.

* jk/diff-files-assume-unchanged:
  run_diff_files: do not look at uninitialized stat data

1  2 
diff-lib.c patch | diff1 | diff2 | blob | history

diff --cc diff-lib.c
Simple merge
Git mirror and local development