summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5728405)
raw | patch | inline | side by side (parent: 5728405)
author | Simon Hausmann <simon@lst.de> | |
Tue, 22 May 2007 22:33:34 +0000 (00:33 +0200) | ||
committer | Simon Hausmann <simon@lst.de> | |
Tue, 22 May 2007 22:33:34 +0000 (00:33 +0200) |
Signed-off-by: Simon Hausmann <simon@lst.de>
contrib/fast-import/git-p4.txt | patch | blob | history |
index ac8e6cff0bff9b34231037ea54c9e8fe696f0bd6..aa9f31e5fc55ebee029a80fb0c71be1ccf714896 100644 (file)
After submitting you should sync your perforce import branch ("p4" or "origin")
from Perforce using git-p4's sync command.
+If you have changes in your working directory that you haven't committed into
+git yet but that you want to commit to Perforce directly ("quick fixes") then
+you do not have to go through the intermediate step of creating a git commit
+first but you can just call
+
+ git-p4 submit --direct
+
Example
=======
to find out which changes need to be imported.
* git-p4 submit uses "git rev-list" to pick the commits between the "p4" branch
and the current branch.
- The commits themselves are applied using git diff-tree ... | patch -p1
+ The commits themselves are applied using git diff/format-patch ... | git apply