Merge branch 'git-p4' of git://repo.or.cz/git/git-p4
commitdc96bdb9469632fcb29f660d18a96fede99fcea2
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Mar 2008 07:02:06 +0000 (23 00:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Mar 2008 07:02:06 +0000 (23 00:02 -0700)
tree8d86a8f116a32005f8ad0bf158ddc49f9eda17b8
parent46220ca100cfbcdd7d80a5ac3326c52a3e98dddb
parent82cea9ffb1c4677155e3e2996d76542502611370
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.