diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-06 00:05:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-06 00:05:49 -0700 |
| commit | b5ef6ac978012475660a36583b2174e9bd8188a5 (patch) | |
| tree | cc845ed2ea1593aa4f1f72089000c843e5391cd3 /Documentation/git-rebase.txt | |
| parent | 7e2e69b7f67ba8b336be56508d0208117d9e22e3 (diff) | |
| parent | 1ca3d71069620f1438d9f89165a3e69e8d47d302 (diff) | |
| download | git-b5ef6ac978012475660a36583b2174e9bd8188a5.tar.gz git-b5ef6ac978012475660a36583b2174e9bd8188a5.tar.xz | |
Merge branch 'master' of git://repo.or.cz/git/git-p4
* 'master' of git://repo.or.cz/git/git-p4:
git-p4: Added support for automatically importing newly appearing perforce branches.
git-p4: Cleanup; moved the (duplicated) code for turning a branch into a git ref (for example foo -> refs/remotes/p4/<project>/foo) into a separate method.
git-p4: Cleanup; moved the code for the initial #head or revision import into a separate function, out of P4Sync.run.
git-p4: Cleanup; Turn self.revision into a function local variable (it's not used anywhere outside the function).
git-p4: Cleanup; moved the code to import a list of p4 changes using fast-import into a separate member function of P4Sync.
git-p4: Cleanup; moved the code for getting a sorted list of p4 changes for a list of given depot paths into a standalone method.
git-p4: After submission to p4 always synchronize from p4 again (into refs/remotes). Whether to rebase HEAD or not is still left as question to the end-user.
git-p4: Always call 'p4 sync ...' before submitting to Perforce.
Diffstat (limited to 'Documentation/git-rebase.txt')
0 files changed, 0 insertions, 0 deletions