From: Junio C Hamano Date: Mon, 19 Nov 2007 00:03:58 +0000 (-0800) Subject: Merge branch 'sh/p4' X-Git-Tag: v1.5.4-rc0~184 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ffa06873d62bba358b51b43def2a0b3aefc790bf?hp=-c Merge branch 'sh/p4' * sh/p4: git-p4: Fix direct import from perforce after fetching changes through git from origin --- ffa06873d62bba358b51b43def2a0b3aefc790bf