summaryrefslogtreecommitdiff
path: root/git-p4import.py
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-06-23 23:54:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-06-23 23:54:41 -0700
commitee4fd1adfda5b6ebde93b289227986bf884babab (patch)
treef178106837457b08eb7041e9c259c3ed6bf9c828 /git-p4import.py
parentMerge branch 'jc/oneline' (diff)
parentImport branch 'git-p4' of git://repo.or.cz/fast-export (diff)
downloadtgif-ee4fd1adfda5b6ebde93b289227986bf884babab.tar.xz
Merge branch 'master' of git://repo.or.cz/git/fastimport
* 'master' of git://repo.or.cz/git/fastimport: (260 commits) Avoid src:dst syntax as default bash completion for git push Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function. Added git-p4 branches command that shows the mapping of perforce depot paths to imported git branches. Warn about conflicting p4 branch mappings and use the first one found. Fix the branch mapping detection to be independent from the order of the "p4 branches" output. git-p4 fails when cloning a p4 depo. Fix initial multi-branch import. Only use double quotes on Windows Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally Moved the code from git-p4 submit to figure out the upstream branch point git-p4 submit: Fix missing quotes around p4 commands to make them work with spaces in filenames Mention remotes/p4/master also in the documentation. Provide some information for single branch imports where the commits go git-p4: check for existence of repo dir before trying to create Write out the options tag in the log message of imports only if we actually have Fix support for explicit disabling of syncing with the origin Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo) Fix project name guessing Fix updating/creating remotes/p4/* heads from origin/p4/* Fixed the check to make sure to exclude the HEAD symbolic refs when updating ...
Diffstat (limited to 'git-p4import.py')
0 files changed, 0 insertions, 0 deletions