My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c80940 a02b8bc)
Merge branch 'rp/p4-filetype-change'
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Jan 2016 23:40:29 +0000 (15:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Jan 2016 23:40:29 +0000 (15:40 -0800)
* rp/p4-filetype-change:
  git-p4.py: add support for filetype change


Trivial merge
The core git plumbing