git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anand Kumria <wildfire@progsoc.org>
To: git@vger.kernel.org
Cc: simon@lst.de, Anand Kumria <wildfire@progsoc.org>
Subject: [PATCH 10/12]  Move git-p4.syncFromOrigin into a configuration parameters section
Date: Sun, 10 Aug 2008 19:26:33 +0100	[thread overview]
Message-ID: <1218392795-4084-11-git-send-email-wildfire@progsoc.org> (raw)
In-Reply-To: <1218392795-4084-10-git-send-email-wildfire@progsoc.org>

Signed-off-by: Anand Kumria <wildfire@progsoc.org>
---
 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...
 =========================
 
-- 
1.5.6.3

  reply	other threads:[~2008-08-10 18:38 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-10 18:26 [PATCH 00/12] Allow users to access Perforce repositories requiring authentication Anand Kumria
2008-08-10 18:26 ` [PATCH 01/12] Create a specific version of the read_pipe_lines command for p4 invocations Anand Kumria
2008-08-10 18:26   ` [PATCH 02/12] Utilise the new 'p4_read_pipe_lines' command Anand Kumria
2008-08-10 18:26     ` [PATCH 03/12] Have a command that specifically invokes 'p4' (via system) Anand Kumria
2008-08-10 18:26       ` [PATCH 04/12] Utilise the new 'p4_system' function Anand Kumria
2008-08-10 18:26         ` [PATCH 05/12] Add a single command that will be used to construct the 'p4' command Anand Kumria
2008-08-10 18:26           ` [PATCH 06/12] If we are in verbose mode, output what we are about to run (or return) Anand Kumria
2008-08-10 18:26             ` [PATCH 07/12] Switch to using 'p4_build_cmd' Anand Kumria
2008-08-10 18:26               ` [PATCH 08/12] If the user has configured various parameters, use them Anand Kumria
2008-08-10 18:26                 ` [PATCH 09/12] Consistently use 'git-p4' for the configuration entries Anand Kumria
2008-08-10 18:26                   ` Anand Kumria [this message]
2008-08-10 18:26                     ` [PATCH 11/12] Put some documentation in about the parameters that have been added Anand Kumria
2008-08-10 18:26                       ` [PATCH 12/12] Put in the two other configuration elements found in the source Anand Kumria
2008-08-13 19:47 ` [PATCH 00/12] Allow users to access Perforce repositories requiring authentication Simon Hausmann
2008-08-14 17:00 ` Tor Arvid Lund
2008-08-14 22:01   ` Anand Kumria

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1218392795-4084-11-git-send-email-wildfire@progsoc.org \
    --to=wildfire@progsoc.org \
    --cc=git@vger.kernel.org \
    --cc=simon@lst.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).