diff options
| author | Simon Hausmann <simon@lst.de> | 2007-04-07 23:46:50 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2007-04-07 23:46:50 +0200 |
| commit | 01ce1fe9676e3f714f3a2d068bf8cfe021f4073c (patch) | |
| tree | 8215536c5b894c0e6ae670c9fa31f3f54045d169 /contrib/fast-import/git-p4.txt | |
| parent | 711544b00c22b1c2559333e8925e449812f9e5cf (diff) | |
| download | git-01ce1fe9676e3f714f3a2d068bf8cfe021f4073c.tar.gz git-01ce1fe9676e3f714f3a2d068bf8cfe021f4073c.tar.xz | |
Added git-p4 rebase convenience
Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'contrib/fast-import/git-p4.txt')
| -rw-r--r-- | contrib/fast-import/git-p4.txt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4.txt b/contrib/fast-import/git-p4.txt index 30e2cb9a5..5f7251c2d 100644 --- a/contrib/fast-import/git-p4.txt +++ b/contrib/fast-import/git-p4.txt @@ -40,12 +40,24 @@ newer changes from the Perforce depot by just calling git-p4 sync -in your git repository. +in your git repository. By default the "p4" branch is updated. It is recommended to run 'git repack -a -d -f' from time to time when using incremental imports to optimally combine the individual git packs that each incremental import creates through the use of git-fast-import. +Updating +======== + +A common working pattern is to fetch the latest changes from the Perforce depot +and merge them with local uncommitted changes. The recommended way is to use +git's rebase mechanism to preserve linear history. git-p4 provides a convenient + + git-p4 rebase + +command that calls git-p4 sync followed by git rebase to rebase the current +working branch. + Submitting ========== |