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


Trivial merge