diff options
| author | Anand Kumria <wildfire@progsoc.org> | 2008-08-10 18:26:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-12 01:57:04 (GMT) |
| commit | bc02acfc769a1ae19772feaa7f03acfaea18a36f (patch) | |
| tree | 7a546a697c6f1ad3706d649c422594bcfa1a18d1 /contrib/fast-import | |
| parent | 3cafb7d8ce63effe6bf477182d431ecb4470eded (diff) | |
| download | git-bc02acfc769a1ae19772feaa7f03acfaea18a36f.zip git-bc02acfc769a1ae19772feaa7f03acfaea18a36f.tar.gz git-bc02acfc769a1ae19772feaa7f03acfaea18a36f.tar.bz2 | |
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>
Diffstat (limited to 'contrib/fast-import')
| -rw-r--r-- | contrib/fast-import/git-p4.txt | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/contrib/fast-import/git-p4.txt b/contrib/fast-import/git-p4.txt index b16a838..0896abb 100644 --- a/contrib/fast-import/git-p4.txt +++ b/contrib/fast-import/git-p4.txt @@ -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 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 ======== @@ -140,6 +128,22 @@ Example 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... ========================= |