undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move git-p4.syncFromOrigin into a configuration parameters section

Browse Source 
Signed-off-by: Anand Kumria <wildfire@progsoc.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Anand Kumria 2008-08-10 19:26:33 +01:00 committed by Junio C Hamano
parent 3cafb7d8ce
commit bc02acfc76
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/fast-import/git-p4.txt
View File

@ -63,18 +63,6 @@ It is recommended to run 'git repack -a -d -f' from time to time when using
incremental imports to optimally combine the individual git packs that each incremental imports to optimally combine the individual git packs that each
incremental import creates through the use of git-fast-import. incremental import creates through the use of git-fast-import.
A useful setup may be that you have a periodically updated git repository
somewhere that contains a complete import of a Perforce project. That git
repository can be used to clone the working repository from and one would
import from Perforce directly after cloning using git-p4. If the connection to
the Perforce server is slow and the working repository hasn't been synced for a
while it may be desirable to fetch changes from the origin git repository using
the efficient git protocol. git-p4 supports this setup by calling "git fetch origin"
by default if there is an origin branch. You can disable this using
git config git-p4.syncFromOrigin false
Updating Updating
======== ========
@ -140,6 +128,22 @@ Example
git-p4 rebase git-p4 rebase
Configuration parameters
========================
git-p4.syncFromOrigin
A useful setup may be that you have a periodically updated git repository
somewhere that contains a complete import of a Perforce project. That git
repository can be used to clone the working repository from and one would
import from Perforce directly after cloning using git-p4. If the connection to
the Perforce server is slow and the working repository hasn't been synced for a
while it may be desirable to fetch changes from the origin git repository using
the efficient git protocol. git-p4 supports this setup by calling "git fetch origin"
by default if there is an origin branch. You can disable this using:
git config [--global] git-p4.syncFromOrigin false
Implementation Details... Implementation Details...
========================= =========================