aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-11 14:23:46 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-11 14:23:46 -0700
commit120c585b229096595b4e54801a538cbef16c8240 (patch)
tree566ff1b59a7fec7924582b52e103eddb5484badc /merge-recursive.c
parent789e98df82817531260fa8b27dce0b30017cc3a2 (diff)
parent96b2d54aeeda3af3775f571a0ab706e6f3678d7a (diff)
downloadgit-120c585b229096595b4e54801a538cbef16c8240.tar.gz
git-120c585b229096595b4e54801a538cbef16c8240.tar.xz
Merge branch 'ls/p4-changes-block-size'
"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
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions