Skip to content

Commit

Permalink
Doc updates
Browse files Browse the repository at this point in the history
Signed-off-by: Simon Hausmann <simon@lst.de>
  • Loading branch information
Simon Hausmann committed May 22, 2007
1 parent 5728405 commit a396b29
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion contrib/fast-import/git-p4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@ 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.

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
=======
Expand Down Expand Up @@ -156,5 +163,5 @@ Implementation Details...
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

0 comments on commit a396b29

Please sign in to comment.