Removed the .py extension from git-p4 as it's annoying to type every time.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann committed
Mar 22, 2007 at 09:13 UTC
e7f0d0d9b9dc99a3f748ed686625cc9f87d9a267
2 files changed
+7
-7
contrib/fast-import/git-p4
renamed
contrib/fast-import/git-p4.txt
+7
-7
@@ -1,11 +1,11 @@
1
-git-p4.py - Perforce <-> Git converter using git-fast-import
1
+git-p4 - Perforce <-> Git converter using git-fast-import
2
3
Usage
4
=====
5
6
git-p4 supports two main modes: Importing from Perforce to a Git repository is
7
-done using "git-p4.py sync". Submitting changes from Git back to Perforce is
8
-done using "git-p4.py submit".
7
+done using "git-p4 sync". Submitting changes from Git back to Perforce is
8
+done using "git-p4 submit".
9
10
Importing
11
=========
@@ -15,7 +15,7 @@ The procedure is simple:
15
mkdir repo-git
16
cd repo-git
17
git init
18
- git-p4.py sync //path/in/your/perforce/depot
18
+ git-p4 sync //path/in/your/perforce/depot
19
20
This will import the current head revision of the specified depot path into the
21
master branch of your git repository. You can use the --branch=mybranch option
@@ -23,7 +23,7 @@ to let git-p4 import from Perforce into a git branch of your choice.
23
24
If you want to import the entire history of a given depot path just use
25
26
- git-p4.py sync //path/in/depot@all
26
+ git-p4 sync //path/in/depot@all
27
28
To achieve optimal compression you may want to run 'git repack -a -d -f' after
29
a big import. This may take a while.
@@ -56,7 +56,7 @@ back to a Perforce depot. This requires a Perforce checkout separate to your
56
git repository. This is the basic procedure:
57
58
cd path/to/your/perforce/checkout
59
- git-p4.py submit --git-dir=/path/to/your/git/repository
59
+ git-p4 submit --git-dir=/path/to/your/git/repository
60
61
This will create a temporary git branch, use git-rev-list to find out which git
62
commits are in your current branch but not in the "origin" branch. You can
@@ -73,7 +73,7 @@ submit template using "e".
73
If a submit fails you may have to "p4 resolve" and submit manually. You can
74
continue importing the remaining changes with
75
76
- git-p4.py submit --git-dir=/path/to/your/git/repository --continue
76
+ git-p4 submit --git-dir=/path/to/your/git/repository --continue
77
78
After submitting you should sync your origin branch from Perforce using
79
git-p4's sync command.