Sync with maint

diff --cc Documentation/git-p4.txt
index 51955a5f7c5a0224494a3f02f7e61ed5131e8dba,cf3a9fd27e888d4281a42d55eabcb66e0b8e76e7..fe1f49bc6f26950987bc5520267663f4f335dab0
--- 1/Documentation/git-p4.txt
--- 2/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
  ----------------------