git-p4: test and document --use-client-spec

[git.git] / Documentation / git-p4.txt

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 9305e099874b259d3aa3ebfd6c7f2a47b73948fc..9a7cdea0f191050de2dd842f38035073a29fef4d 100644 (file)
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -211,7 +211,9 @@ git repository:
        By default, p4 branches are stored in 'refs/remotes/p4/',
        where they will be treated as remote-tracking branches by
        linkgit:git-branch[1] and other commands.  This option instead
-       puts p4 branches in 'refs/heads/p4/'.
+       puts p4 branches in 'refs/heads/p4/'.  Note that future
+       sync operations must specify '--import-local' as well so that
+       they can find the p4 branches in refs/heads.
 
 --max-changes <n>::
        Limit the number of imported changes to 'n'.  Useful to
@@ -230,7 +232,10 @@ git repository:
        Use a client spec to find the list of interesting files in p4.
        The client spec is discovered using 'p4 client -o' which checks
        the 'P4CLIENT' environment variable and returns a mapping of
-       depot files to workspace files.
+       depot files to workspace files.  Note that a depot path is
+       still required, but files found in the path that match in
+       the client spec view will be laid out according to the client
+       spec.
 
 Clone options
 ~~~~~~~~~~~~~