summaryrefslogtreecommitdiff
path: root/contrib/fast-import/git-p4.txt
diff options
context:
space:
mode:
authorSimon Hausmann <simon@lst.de>2007-04-08 10:21:56 +0200
committerSimon Hausmann <simon@lst.de>2007-04-08 10:21:56 +0200
commit7243b350b3469eb78be950331290ea16e57c3de8 (patch)
treef130cc808edec6a01e4dd4bc8c80107341dab815 /contrib/fast-import/git-p4.txt
parent10c3211b81a2f67c3853900e462333933f910696 (diff)
downloadgit-7243b350b3469eb78be950331290ea16e57c3de8.tar.gz
Added a simple example of usage to the "documentation" :)
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.txt22
1 files changed, 22 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4.txt b/contrib/fast-import/git-p4.txt
index 99ae85bd7b..4f6a680f95 100644
--- a/contrib/fast-import/git-p4.txt
+++ b/contrib/fast-import/git-p4.txt
@@ -103,3 +103,25 @@ continue importing the remaining changes with
After submitting you should sync your perforce import branch ("p4" or "origin")
from Perforce using git-p4's sync command.
+
+
+Example
+=======
+
+# Clone a repository
+ git-p4 clone //depot/path/project
+# Enter the newly cloned directory
+ cd project
+# Do some work...
+ vi foo.h
+# ... and commit locally to gi
+ git commit foo.h
+# In the meantime somebody submitted changes to the Perforce depot. Rebase your latest
+# changes against the latest changes in Perforce:
+ git-p4 rebase
+# Submit your locally committed changes back to Perforce
+ git-p4 submit
+# ... and synchronize with Perforce
+ git-p4 rebase
+
+