X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-p4import.txt;h=ee9e8fa9090f88d1eb45ddbdb73866e0dc1fd53d;hb=922819c3d51bb048fe2194f33c275abe4c3d4b6a;hp=c198ff2502d95be4dc1baadd6479b687acb0caa1;hpb=3742506578dda5de2fe97e403f04150a85ffef17;p=git.git diff --git a/Documentation/git-p4import.txt b/Documentation/git-p4import.txt index c198ff250..ee9e8fa90 100644 --- 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 ] [-t ] +`git-p4import` [-q|-v] [--notags] [--authors ] [-t ] `git-p4import` --stitch @@ -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. @@ -125,7 +128,7 @@ 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 there are new changes to incrementally import from the @@ -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