@matheusbsbs / matheus-bagliano / commits / a396b29267
Fork 0

Doc updates

Signed-off-by: Simon Hausmann <simon@lst.de>

Simon Hausmann committed May 23, 2007 at 00:33 UTC a396b292678838b4cae1b358c62da6b4e0929fc2
1 file changed +8 -1
contrib/fast-import/git-p4.txt
+8 -1
@@ -120,6 +120,13 @@ continue importing the remaining changes with
120 After submitting you should sync your perforce import branch ("p4" or "origin")
121 from Perforce using git-p4's sync command.
122
123 +If you have changes in your working directory that you haven't committed into
124 +git yet but that you want to commit to Perforce directly ("quick fixes") then
125 +you do not have to go through the intermediate step of creating a git commit
126 +first but you can just call
127 +
128 + git-p4 submit --direct
129 +
130
131 Example
132 =======
@@ -156,5 +163,5 @@ Implementation Details...
163 to find out which changes need to be imported.
164 * git-p4 submit uses "git rev-list" to pick the commits between the "p4" branch
165 and the current branch.
159 - The commits themselves are applied using git diff-tree ... | patch -p1
166 + The commits themselves are applied using git diff/format-patch ... | git apply
167