summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 10c3211)
raw | patch | inline | side by side (parent: 10c3211)
author | Simon Hausmann <simon@lst.de> | |
Sun, 8 Apr 2007 08:21:56 +0000 (10:21 +0200) | ||
committer | Simon Hausmann <simon@lst.de> | |
Sun, 8 Apr 2007 08:21:56 +0000 (10:21 +0200) |
Signed-off-by: Simon Hausmann <simon@lst.de>
contrib/fast-import/git-p4.txt | patch | blob | history |
index 99ae85bd7ba425a15c55ffb3db651a3698d7176d..4f6a680f95f2c3f11a25bb0f0c795dab4bcc5419 100644 (file)
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
+
+