From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Aug 2011 04:15:34 +0000 (-0700)
Subject: Merge branch 'va/p4-branch-import'
X-Git-Tag: v1.7.7-rc1~46
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cfd2f0f5580a5524707693d4d055b18b519a325c;p=git.git

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
---

cfd2f0f5580a5524707693d4d055b18b519a325c