From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Feb 2011 05:58:30 +0000 (-0800)
Subject: Merge branch 'pw/p4'
X-Git-Tag: v1.7.5-rc0~116
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8d3a3620288734f068b4fa024f5aa3ac2d696fcc;p=git.git

Merge branch 'pw/p4'

* pw/p4:
  git-p4: support clone --bare
  git-p4: decode p4 wildcard characters
  git-p4: better message for "git-p4 sync" when not cloned
  git-p4: reinterpret confusing p4 message
  git-p4: accommodate new move/delete type in p4
  git-p4: add missing newline in initial import message
  git-p4: fix key error for p4 problem
  git-p4: test script
---

8d3a3620288734f068b4fa024f5aa3ac2d696fcc