![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Oct 2011 23:04:33 +0000 (16:04 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Oct 2011 23:04:33 +0000 (16:04 -0700) | ||
| commit | 5a4fcc28e116f769abf94a0acc558fd37a44bcfb | |
| tree | bbe9358734bbc7bf62428c9df2349457074e3ef9 | tree | snapshot |
| parent | abe277301996d4b30f2c8f48cf92dcf677af783d | commit | diff |
| parent | 6de040df566d4b4489366aa2ae5cc215ec449618 | commit | diff |
Merge branch 'pw/p4-update'
* pw/p4-update:
git-p4: handle files with shell metacharacters
git-p4: keyword flattening fixes
git-p4: stop ignoring apple filetype
git-p4: recognize all p4 filetypes
git-p4: handle utf16 filetype properly
git-p4 tests: refactor and cleanup
* pw/p4-update:
git-p4: handle files with shell metacharacters
git-p4: keyword flattening fixes
git-p4: stop ignoring apple filetype
git-p4: recognize all p4 filetypes
git-p4: handle utf16 filetype properly
git-p4 tests: refactor and cleanup