Merge branch 'va/p4-branch-import'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:15:34 +0000 (21:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 04:15:34 +0000 (21:15 -0700)
* va/p4-branch-import:
git-p4: Add simple test case for branch import
git-p4: Allow branch definition with git config
git-p4: Allow filtering Perforce branches by user
git-p4: Correct branch base depot path detection
git-p4: Process detectCopiesHarder with --bool
git-p4: Add test case for copy detection
git-p4: Add test case for rename detection
git-p4: Add description of rename/copy detection options
git-p4: Allow setting rename/copy detection threshold

Trivial merge