Move git-p4.syncFromOrigin into a configuration parameters section
Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Anand Kumria committed
Aug 10, 2008 at 19:26 UTC
bc02acfc769a1ae19772feaa7f03acfaea18a36f
1 file changed
+16
-12
contrib/fast-import/git-p4.txt
+16
-12
@@ -63,18 +63,6 @@ It is recommended to run 'git repack -a -d -f' from time to time when using
63
incremental imports to optimally combine the individual git packs that each
64
incremental import creates through the use of git-fast-import.
65
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
-
66
Updating
67
========
68
@@ -140,6 +128,22 @@ Example
128
git-p4 rebase
129
130
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
+
147
Implementation Details...
148
=========================
149