diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:46 -0700 |
| commit | 120c585b229096595b4e54801a538cbef16c8240 (patch) | |
| tree | 566ff1b59a7fec7924582b52e103eddb5484badc /Documentation/git-merge-file.txt | |
| parent | Merge branch 'jc/plug-fmt-merge-msg-leak' (diff) | |
| parent | git-p4: use -m when running p4 changes (diff) | |
| download | tgif-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 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions