diff options
| author |  Simon Hausmann <simon@lst.de> | 2007-05-23 00:33:34 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2007-05-23 00:33:34 +0200 |
| commit | a396b292678838b4cae1b358c62da6b4e0929fc2 (patch) | |
| tree | d911f14694fdf70f2a71699b5fc94127f044bb47 | |
| parent | Use refs/heads/* instead of refs/heads/p4/* for local imports (diff) | |
| download | tgif-a396b292678838b4cae1b358c62da6b4e0929fc2.tar.xz | |
Doc updates
Signed-off-by: Simon Hausmann <simon@lst.de>
| -rw-r--r-- | contrib/fast-import/git-p4.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4.txt b/contrib/fast-import/git-p4.txt index ac8e6cff0b..aa9f31e5fc 100644 --- a/contrib/fast-import/git-p4.txt +++ b/contrib/fast-import/git-p4.txt @@ -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 ======= @@ -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 |