Merge branch 'ls/p4-changes-block-size'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:46 +0000 (14:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:46 +0000 (14:23 -0700)
"git p4" learned "--changes-block-size <n>" to read the changes in
chunks from Perforce, instead of making one call to "p4 changes"
that may trigger "too many rows scanned" error from Perforce.

* ls/p4-changes-block-size:
git-p4: use -m when running p4 changes

1  2 
git-p4.py
diff --cc git-p4.py
Simple merge