From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 23 Mar 2008 07:02:06 +0000 (-0700)
Subject: Merge branch 'git-p4' of git://repo.or.cz/git/git-p4
X-Git-Tag: v1.5.5-rc1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dc96bdb9469632fcb29f660d18a96fede99fcea2;p=git.git

Merge branch 'git-p4' of git://repo.or.cz/git/git-p4

* 'git-p4' of git://repo.or.cz/git/git-p4:
  git-p4: Use P4EDITOR environment variable when set
  git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'
  git-p4: Optimize the fetching of data from perforce.
---

dc96bdb9469632fcb29f660d18a96fede99fcea2