@@ -63,18 +63,6 @@ It is recommended to run 'git repack -a -d -f' from time to time when using
6363incremental imports to optimally combine the individual git packs that each
6464incremental import creates through the use of git-fast-import.
6565
66-
67- A useful setup may be that you have a periodically updated git repository
68- somewhere that contains a complete import of a Perforce project. That git
69- repository can be used to clone the working repository from and one would
70- import from Perforce directly after cloning using git-p4. If the connection to
71- the Perforce server is slow and the working repository hasn't been synced for a
72- while it may be desirable to fetch changes from the origin git repository using
73- the efficient git protocol. git-p4 supports this setup by calling "git fetch origin"
74- by default if there is an origin branch. You can disable this using
75-
76- git config git-p4.syncFromOrigin false
77-
7866Updating
7967========
8068
@@ -140,6 +128,22 @@ Example
140128 git-p4 rebase
141129
142130
131+ Configuration parameters
132+ ========================
133+
134+ git-p4.syncFromOrigin
135+
136+ A useful setup may be that you have a periodically updated git repository
137+ somewhere that contains a complete import of a Perforce project. That git
138+ repository can be used to clone the working repository from and one would
139+ import from Perforce directly after cloning using git-p4. If the connection to
140+ the Perforce server is slow and the working repository hasn't been synced for a
141+ while it may be desirable to fetch changes from the origin git repository using
142+ the efficient git protocol. git-p4 supports this setup by calling "git fetch origin"
143+ by default if there is an origin branch. You can disable this using:
144+
145+ git config [--global] git-p4.syncFromOrigin false
146+
143147Implementation Details...
144148=========================
145149
0 commit comments