aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-p4.txt
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2012-04-11 17:21:24 +0200
committerJunio C Hamano <gitster@pobox.com>2012-04-24 14:17:39 -0700
commitc8942a223d41adab336946913f28cf8691ee479a (patch)
tree97d34e6eecfb69dd36ea1cd7add9438671106888 /Documentation/git-p4.txt
parent06804c76e8f7a61c7c9473decdf9b210d3238e9d (diff)
downloadgit-c8942a223d41adab336946913f28cf8691ee479a.tar.gz
git-c8942a223d41adab336946913f28cf8691ee479a.tar.xz
git p4: fix-up "import/export of labels to/from p4"
The previous one is already in 'next' but was somewhat lacking. The configuration "git-p4.validLabelRegexp" is now called "labelExportRegexp", and its default covers lowercase alphabets as well. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
-rw-r--r--Documentation/git-p4.txt20
1 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 612d51d4e..01cc97bb1 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -267,7 +267,7 @@ These options can be used to modify 'git p4 submit' behavior.
Re-author p4 changes before submitting to p4. This option
requires p4 admin privileges.
---export-labels:
+--export-labels::
Export tags from git as p4 labels. Tags found in git are applied
to the perforce working directory.
@@ -442,6 +442,11 @@ git-p4.branchList::
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
+-------------
+
git-p4.ignoredP4Labels::
List of p4 labels to ignore. This is built automatically as
unimportable labels are discovered.
@@ -449,14 +454,9 @@ git-p4.ignoredP4Labels::
git-p4.importLabels::
Import p4 labels into git, as per --import-labels.
-git-p4.validLabelRegexp::
+git-p4.labelImportRegexp::
Only p4 labels matching this regular expression will be imported. The
- default value is '[A-Z0-9_\-.]+$'.
-
--------------
-git config git-p4.branchList main:branchA
-git config --add git-p4.branchList main:branchB
--------------
+ default value is '[a-zA-Z0-9_\-.]+$'.
git-p4.useClientSpec::
Specify that the p4 client spec should be used to identify p4
@@ -515,9 +515,9 @@ git-p4.attemptRCSCleanup:
git-p4.exportLabels::
Export git tags to p4 labels, as per --export-labels.
-git-p4.validLabelRegexp::
+git-p4.labelExportRegexp::
Only p4 labels matching this regular expression will be exported. The
- default value is '[A-Z0-9_\-.]+$'.
+ default value is '[a-zA-Z0-9_\-.]+$'.
IMPLEMENTATION DETAILS
----------------------