Merge branch 'ar/progress'

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

diff --git a/Documentation/git-p4import.txt b/Documentation/git-p4import.txt
index b8ff1e9bdebf04132a5b7dc85305ce0a20e95e09..714abbe28ecfef592d0a7892dccbe88c8f66967c 100644 (file)
--- a/Documentation/git-p4import.txt
+++ b/Documentation/git-p4import.txt
@@ -8,10 +8,10 @@ git-p4import - Import a Perforce repository into git
 
 SYNOPSIS
 --------
-`git-p4import` [-q|-v] [--authors <file>] [-t <timezone>] <//p4repo/path> <branch>
-
+[verse]
+`git-p4import` [-q|-v] [--notags] [--authors <file>] [-t <timezone>]
+               <//p4repo/path> <branch>
 `git-p4import` --stitch <//p4repo/path>
-
 `git-p4import`
 
 
@@ -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.
@@ -90,7 +93,7 @@ perforce branch into a branch named "jammy", like so:
 ------------
 $ mkdir -p /home/sean/import/jam
 $ cd /home/sean/import/jam
-$ git init-db
+$ git init
 $ git p4import //public/jam jammy
 ------------
 
@@ -125,10 +128,10 @@ Tags
 A git tag of the form p4/xx is created for every change imported from
 the Perforce repository where xx is the Perforce changeset number.
 Therefore after the import you can use git to access any commit by its
-Perforce number, eg. git show p4/327.
+Perforce number, e.g. 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
@@ -140,7 +143,7 @@ may delete the tags.
 
 Notes
 -----
-You can interrupt the import (eg. ctrl-c) at any time and restart it
+You can interrupt the import (e.g. ctrl-c) at any time and restart it
 without worry.
 
 Author information is automatically determined by querying the