Sync with 2.3.3

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 8cba16d67f29ec48738b00a607add4a20bc7d4b2..a1664b9f684bae0d3e715b36760ce62f4745ed06 100644 (file)
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -168,7 +168,8 @@ All commands except clone accept these options.
 --git-dir <dir>::
        Set the 'GIT_DIR' environment variable.  See linkgit:git[1].
 
---verbose, -v::
+-v::
+--verbose::
        Provide more progress information.
 
 Sync options
@@ -240,6 +241,9 @@ Git repository:
        Use a client spec to find the list of interesting files in p4.
        See the "CLIENT SPEC" section below.
 
+-/ <path>::
+       Exclude selected depot paths when cloning or syncing.
+
 Clone options
 ~~~~~~~~~~~~~
 These options can be used in an initial 'clone', along with the 'sync'
@@ -253,9 +257,6 @@ options described above.
 --bare::
        Perform a bare clone.  See linkgit:git-clone[1].
 
--/ <path>::
-       Exclude selected depot paths when cloning.
-
 Submit options
 ~~~~~~~~~~~~~~
 These options can be used to modify 'git p4 submit' behavior.
@@ -279,7 +280,8 @@ These options can be used to modify 'git p4 submit' behavior.
        Export tags from Git as p4 labels. Tags found in Git are applied
        to the perforce working directory.
 
---dry-run, -n::
+-n::
+--dry-run::
        Show just what commits would be submitted to p4; do not change
        state in Git or p4.