path: root/Documentation
diff options
authorJunio C Hamano <>2015-05-11 21:23:46 (GMT)
committerJunio C Hamano <>2015-05-11 21:23:46 (GMT)
commit120c585b229096595b4e54801a538cbef16c8240 (patch)
tree566ff1b59a7fec7924582b52e103eddb5484badc /Documentation
parent789e98df82817531260fa8b27dce0b30017cc3a2 (diff)
parent96b2d54aeeda3af3775f571a0ab706e6f3678d7a (diff)
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')
1 files changed, 14 insertions, 3 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index a1664b9..82aa5d6 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -225,9 +225,20 @@ Git repository:
they can find the p4 branches in refs/heads.
--max-changes <n>::
- Limit the number of imported changes to 'n'. Useful to
- limit the amount of history when using the '@all' p4 revision
- specifier.
+ Import at most 'n' changes, rather than the entire range of
+ changes included in the given revision specifier. A typical
+ usage would be use '@all' as the revision specifier, but then
+ to use '--max-changes 1000' to import only the last 1000
+ revisions rather than the entire revision history.
+--changes-block-size <n>::
+ The internal block size to use when converting a revision
+ specifier such as '@all' into a list of specific change
+ numbers. Instead of using a single call to 'p4 changes' to
+ find the full list of changes for the conversion, there are a
+ sequence of calls to 'p4 changes -m', each of which requests
+ one block of changes of the given size. The default block size
+ is 500, which should usually be suitable.
The mapping of file names from the p4 depot path to Git, by