diff options
| author | Simon Hausmann <simon@lst.de> | 2007-05-01 18:28:38 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2007-05-01 18:28:38 +0200 |
| commit | ff5dba20e324fb394b7077d0b1d1c5eb4357959f (patch) | |
| tree | 1f5a32be38839b505c14592d9c01c21d87061142 /contrib/fast-import/git-p4.txt | |
| parent | 51a2640afdd12475642728dc3576966abe0dba6d (diff) | |
| download | git-ff5dba20e324fb394b7077d0b1d1c5eb4357959f.tar.gz | |
Doc cleanups.
Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'contrib/fast-import/git-p4.txt')
| -rw-r--r-- | contrib/fast-import/git-p4.txt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/fast-import/git-p4.txt b/contrib/fast-import/git-p4.txt index 4f6a680f95..d36a1cf18c 100644 --- a/contrib/fast-import/git-p4.txt +++ b/contrib/fast-import/git-p4.txt @@ -4,8 +4,8 @@ Usage ===== git-p4 supports two main modes: Importing from Perforce to a Git repository is -done using "git-p4 sync". Submitting changes from Git back to Perforce is -done using "git-p4 submit". +done using "git-p4 sync" or "git-p4 rebase". Submitting changes from Git back +to Perforce is done using "git-p4 submit". Importing ========= @@ -49,10 +49,6 @@ a big import. This may take a while. Support for Perforce integrations is still work in progress. Don't bother trying it unless you want to hack on it :) -For convenience there's also the git-p4 clone command that works similar to -git-clone and combines the creation of the git repository with the the initial -import and the branch setup - Incremental Imports =================== |