From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 May 2012 20:28:34 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v1.7.11-rc0~56
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad799ea37589029256644d5420c1edc29821a8d2;p=git.git

Sync with maint
---

ad799ea37589029256644d5420c1edc29821a8d2
diff --cc Documentation/git-p4.txt
index 51955a5f7,cf3a9fd27..fe1f49bc6
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@@ -503,18 -489,11 +504,18 @@@ 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
 -    present.
 +	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
 +	present.
 +
 +git-p4.exportLabels::
 +	Export git tags to p4 labels, as per --export-labels.
 +
 +git-p4.labelExportRegexp::
 +	Only p4 labels matching this regular expression will be exported. The
 +	default value is '[a-zA-Z0-9_\-.]+$'.
  
  IMPLEMENTATION DETAILS
  ----------------------