Changed the default branch for imports from "master" to "p4"

Signed-off-by: Simon Hausmann <simon@lst.de>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index a5b6d94d1a162f8cbf4e0c1d9efa69e731cfb060..669cf95d74908abb35e93486234202bb2cbdaa3b 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -352,7 +352,7 @@ class GitSync(Command):
         self.knownBranches = Set()
         self.createdBranches = Set()
         self.committedChanges = Set()
         self.knownBranches = Set()
         self.createdBranches = Set()
         self.committedChanges = Set()

-        self.branch = "master"
+        self.branch = "p4"

         self.detectBranches = False
         self.changesFile = ""
 
         self.detectBranches = False
         self.changesFile = ""
 

diff --git a/contrib/fast-import/git-p4.txt b/contrib/fast-import/git-p4.txt
index 5786bffad4aafdc207a0a658e8ea225d89e7fca4..0d30aff64cdc91fa48551dcee474493b48c2b498 100644 (file)
--- a/contrib/fast-import/git-p4.txt
+++ b/contrib/fast-import/git-p4.txt
@@ -17,9 +17,9 @@ The procedure is simple:
   git init
   git-p4 sync //path/in/your/perforce/depot
 
   git init
   git-p4 sync //path/in/your/perforce/depot
 

-This will import the current head revision of the specified depot path into the
-master branch of your git repository. You can use the --branch=mybranch option
-to let git-p4 import from Perforce into a git branch of your choice.
+This will import the current head revision of the specified depot path into a
+"p4" branch of your git repository. You can use the --branch=mybranch option
+to use a different branch.

 
 If you want to import the entire history of a given depot path just use
 
 
 If you want to import the entire history of a given depot path just use