Merge branch 'jc/rw-prefix'

diff --git a/Documentation/git-p4import.txt b/Documentation/git-p4import.txt
index b8ff1e9bdebf04132a5b7dc85305ce0a20e95e09..0858e5efbe01a8e47ddcfa9b1c7e1c6169f9b7e1 100644 (file)
--- a/Documentation/git-p4import.txt
+++ b/Documentation/git-p4import.txt
@@ -8,7 +8,7 @@ git-p4import - Import a Perforce repository into git
 
 SYNOPSIS
 --------
-`git-p4import` [-q|-v] [--authors <file>] [-t <timezone>] <//p4repo/path> <branch>
+`git-p4import` [-q|-v] [--notags] [--authors <file>] [-t <timezone>] <//p4repo/path> <branch>
 
 `git-p4import` --stitch <//p4repo/path>
 
@@ -43,6 +43,9 @@ OPTIONS
        Specify an authors file containing a mapping of Perforce user
        ids to full names and email addresses (see Notes below).
 
+\--notags::
+       Do not create a tag for each imported commit.
+
 \--stitch::
        Import the contents of the given perforce branch into the
        currently checked out git branch.
@@ -128,7 +131,7 @@ Therefore after the import you can use git to access any commit by its
 Perforce number, eg. git show p4/327.
 
 The tag associated with the HEAD commit is also how `git-p4import`
-determines if their are new changes to incrementally import from the
+determines if there are new changes to incrementally import from the
 Perforce repository.
 
 If you import from a repository with many thousands of changes