diff options
| author |  Simon Hausmann <hausmann@kde.org> | 2007-03-22 09:13:01 +0100 |
|---|---|---|
| committer | Simon Hausmann <hausmann@kde.org> | 2007-03-22 09:15:32 +0100 |
| commit | e7f0d0d9b9dc99a3f748ed686625cc9f87d9a267 (patch) | |
| tree | 2472b80eae7aa7b1d0292deb5505e9e970374873 /contrib/fast-import | |
| parent | Don't show the submit template and the diff first in less but show it in $edi... (diff) | |
| download | tgif-e7f0d0d9b9dc99a3f748ed686625cc9f87d9a267.tar.xz | |
Removed the .py extension from git-p4 as it's annoying to type every time.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 (renamed from contrib/fast-import/git-p4.py) | 0 | ||||
| -rw-r--r-- | contrib/fast-import/git-p4.txt | 14 |
2 files changed, 7 insertions, 7 deletions
diff --git a/contrib/fast-import/git-p4.py b/contrib/fast-import/git-p4 index 06858844e5..06858844e5 100755 --- a/contrib/fast-import/git-p4.py +++ b/contrib/fast-import/git-p4 diff --git a/contrib/fast-import/git-p4.txt b/contrib/fast-import/git-p4.txt index 4b4fcde72b..5786bffad4 100644 --- a/contrib/fast-import/git-p4.txt +++ b/contrib/fast-import/git-p4.txt @@ -1,11 +1,11 @@ -git-p4.py - Perforce <-> Git converter using git-fast-import +git-p4 - Perforce <-> Git converter using git-fast-import Usage ===== git-p4 supports two main modes: Importing from Perforce to a Git repository is -done using "git-p4.py sync". Submitting changes from Git back to Perforce is -done using "git-p4.py submit". +done using "git-p4 sync". Submitting changes from Git back to Perforce is +done using "git-p4 submit". Importing ========= @@ -15,7 +15,7 @@ The procedure is simple: mkdir repo-git cd repo-git git init - git-p4.py sync //path/in/your/perforce/depot + 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 @@ -23,7 +23,7 @@ to let git-p4 import from Perforce into a git branch of your choice. If you want to import the entire history of a given depot path just use - git-p4.py sync //path/in/depot@all + git-p4 sync //path/in/depot@all To achieve optimal compression you may want to run 'git repack -a -d -f' after 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 git repository. This is the basic procedure: cd path/to/your/perforce/checkout - git-p4.py submit --git-dir=/path/to/your/git/repository + git-p4 submit --git-dir=/path/to/your/git/repository This will create a temporary git branch, use git-rev-list to find out which git commits are in your current branch but not in the "origin" branch. You can @@ -73,7 +73,7 @@ submit template using "e". If a submit fails you may have to "p4 resolve" and submit manually. You can continue importing the remaining changes with - git-p4.py submit --git-dir=/path/to/your/git/repository --continue + git-p4 submit --git-dir=/path/to/your/git/repository --continue After submitting you should sync your origin branch from Perforce using git-p4's sync command. |