Skip to content

Commit bc02acf

Browse files
Anand Kumriagitster
authored andcommitted
Move git-p4.syncFromOrigin into a configuration parameters section
Signed-off-by: Anand Kumria <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3cafb7d commit bc02acf

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

contrib/fast-import/git-p4.txt

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,6 @@ It is recommended to run 'git repack -a -d -f' from time to time when using
6363
incremental imports to optimally combine the individual git packs that each
6464
incremental 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-
7866
Updating
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+
143147
Implementation Details...
144148
=========================
145149

0 commit comments

Comments
 (0)