diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-21 16:04:33 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 16:04:33 -0700 |
commit | 5a4fcc28e116f769abf94a0acc558fd37a44bcfb (patch) | |
tree | bbe9358734bbc7bf62428c9df2349457074e3ef9 /tree.h | |
parent | abe277301996d4b30f2c8f48cf92dcf677af783d (diff) | |
parent | 6de040df566d4b4489366aa2ae5cc215ec449618 (diff) | |
download | git-5a4fcc28e116f769abf94a0acc558fd37a44bcfb.tar.gz git-5a4fcc28e116f769abf94a0acc558fd37a44bcfb.tar.xz |
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
Diffstat (limited to 'tree.h')
0 files changed, 0 insertions, 0 deletions