diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:28:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:28:34 -0700 |
| commit | ad799ea37589029256644d5420c1edc29821a8d2 (patch) | |
| tree | 6928af5d2cef9bbe3974b208e2e6f85e0653be81 /Documentation/git-p4.txt | |
| parent | 8275905e7e9e8945f0bffdd207f622be39026943 (diff) | |
| parent | 42325fb2e078377a3914bf1d80160f22cb1f78d6 (diff) | |
| download | git-ad799ea37589029256644d5420c1edc29821a8d2.tar.gz | |
Sync with maint
Diffstat (limited to 'Documentation/git-p4.txt')
| -rw-r--r-- | Documentation/git-p4.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 51955a5f7c..fe1f49bc6f 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -179,6 +179,7 @@ subsequent 'sync' operations. + This example imports a new remote "p4/proj2" into an existing git repository: ++ ---- $ git init $ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2 @@ -438,7 +439,7 @@ git-p4.branchList:: enabled. Each entry should be a pair of branch names separated by a colon (:). This example declares that both branchA and branchB were created from main: - ++ ------------- git config git-p4.branchList main:branchA git config --add git-p4.branchList main:branchB @@ -503,7 +504,7 @@ git-p4.skipUserNameCheck:: user map, 'git p4' exits. This option can be used to force submission regardless. -git-p4.attemptRCSCleanup: +git-p4.attemptRCSCleanup:: If enabled, 'git p4 submit' will attempt to cleanup RCS keywords ($Header$, etc). These would otherwise cause merge conflicts and prevent the submit going ahead. This option should be considered experimental at |