From: Junio C Hamano Date: Mon, 19 Nov 2007 00:03:58 +0000 (-0800) Subject: Merge branch 'sh/p4' X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=ffa06873d62bba358b51b43def2a0b3aefc790bf;p=rit Merge branch 'sh/p4' * sh/p4: git-p4: Fix direct import from perforce after fetching changes through git from origin --- ffa06873d62bba358b51b43def2a0b3aefc790bf