![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Aug 2011 04:15:34 +0000 (21:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Aug 2011 04:15:34 +0000 (21:15 -0700) | ||
| commit | cfd2f0f5580a5524707693d4d055b18b519a325c | |
| tree | 45dbb021a53c038455f2b65876c1dfe18040eba8 | tree | snapshot |
| parent | e78f8291436753d98829f32cf5308fd99d59971b | commit | diff |
| parent | 7ca97f6ecc66f1d70ca126edd33b6a3065c914f7 | commit | diff |
Merge branch 'va/p4-branch-import'
* 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
* 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