My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e971a1f 34a0dbf)
Merge branch 'ld/p4-filetype-detection'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:27 +0000 (21:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:28 +0000 (21:00 -0700)
* ld/p4-filetype-detection:
  git-p4: fix filetype detection on files opened exclusively
  git-p4: small fix for locked-file-move-test
  git-p4: fix small bug in locked test scripts


Trivial merge
The core git plumbing