kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
85 Commits
6 Branches
36 Tags
131 MiB
Tree: e7f0d0d9b9
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'e7f0d0d9b9'
${ noResults }
Commit Graph

85 Commits (e7f0d0d9b9dc99a3f748ed686625cc9f87d9a267)
 

Author SHA1 Message Date
Simon Hausmann e7f0d0d9b9 Removed the .py extension from git-p4 as it's annoying to type every time.
18 years ago
Simon Hausmann 53150250b1 Don't show the submit template and the diff first in less but show it in $editor right away
18 years ago
Simon Hausmann 2061865005 Make it possible to invoke git-p4 from within subdirectories of a git working tree.
18 years ago
Simon Hausmann 1932a6ac7c Made --apply-as-patch the default for git-p4 submit as it's significantly faster.
18 years ago
Simon Hausmann 5d0b6042d4 Fix support for deletions in git-p4 submit when using --apply-as-patch by filtering out deletions in the diff-tree output.
18 years ago
Simon Hausmann 04219c04b7 Added experimental but super-fast --apply-as-patch option to git-p4 submit
18 years ago
Simon Hausmann b4aa8d12b4 Documentation enhancements.
18 years ago
Simon Hausmann 0b69b46925 Start of the git-p4 documentation.
18 years ago
Simon Hausmann c5fdcbcc20 Removed p4-fast-export and p4-git-sync as they've been integrated into git-p4 now.
18 years ago
Simon Hausmann c715706b15 Fixed the initial version import by getting the file index correct by correctly skipping deleted files.
18 years ago
Simon Hausmann 0828ab1403 Added missing "self"s to make the script evaluate correctly.
18 years ago
Simon Hausmann b984733c80 Completely untested "merge" of p4-fast-export.py into git-p4.py
18 years ago
Simon Hausmann 05140f342e sync-to-perforce is now called submit and fixed the gitdir check a little bit
18 years ago
Simon Hausmann 83dce55af3 Part of the code is copyright by Trolltech ASA.
18 years ago
Simon Hausmann 4f5cf76a55 First (untested) attempt at migrating p4-git-sync into the final git-p4 script
18 years ago
Simon Hausmann c8c3911685 Provide a little bit of help description for the git-p4 "tools".
18 years ago
Simon Hausmann 86949eef40 Start moving the git-p4 tools into one single script.
18 years ago
Simon Hausmann 95d27cb75d Pass the right number of arguments to commit, fixes single-branch imports.
18 years ago
Simon Hausmann 09e16455e0 Improved the git dir detection.
18 years ago
Simon Hausmann 228d36c92b Default to interactive syncing
18 years ago
Simon Hausmann f72537f97e Use p4 revert ... instead of revert -a ... after submitting, to make sure the p4 checkout is clean.
18 years ago
Simon Hausmann d566209e7f Auto-detect the current git branch before submitting back to perforce.
18 years ago
Simon Hausmann 4d9e5fcea6 Ignore Apple resource files when importing from perforce to git.
18 years ago
Simon Hausmann d7873afdf4 Be nice and use /usr/bin/env python for the git-p4 scripts
18 years ago
Simon Hausmann 794a913a00 Automatically operate on a temporary branch, needed for cherry-pick to work when applying changes to
18 years ago
Simon Hausmann 09a14fb524 Lots of bugfixes to p4-git-sync.
18 years ago
Simon Hausmann 5aba82fd50 Fix git-dir option and allow reading log substitutions from a file
18 years ago
Simon Hausmann 0bcff6121d First version of a new script to submit changes back to perforce from git repositories.
18 years ago
Simon Hausmann 4fe2ca17f7 Split up the cache commandline options into (command) cache and data cache.
18 years ago
Simon Hausmann dd87020bd3 Reduce the number of false "merges" by skipping "branch from" entries in the integrated output as well as by ignoring integrations of future (newer) changes.
18 years ago
Simon Hausmann 43cc31e8a2 More work on branch detection by implementing changeIsBranchMerge().
18 years ago
Simon Hausmann 85a8f1ac3b More code cleanups and preparations for more branch detection heuristics.
18 years ago
Simon Hausmann 478764bc82 Minor code cleanups.
18 years ago
Simon Hausmann 59f1d2b52d Make the p4 data/command cache configurable through the --cache-debug commandline option.
18 years ago
Simon Hausmann a0f22e996c Fixed p4-debug file extension.
18 years ago
Simon Hausmann 934371385c Changed --known-branches to take a file as argument instead of a comma separated list.
18 years ago
Simon Hausmann 3ef674bd4b Work in progress on detecting branches.
18 years ago
Simon Hausmann 6392a40e5e Adjust the output parsing of git name-rev to handle the output of the latest git version.
18 years ago
Simon Hausmann 5ea919de22 Don't print a plain newline at the end of the execution (avoids bogus cron error mails).
18 years ago
Simon Hausmann 47e33ec082 More work in --silent support.
18 years ago
Simon Hausmann 161958cc2f Added support for --silent so that p4-fast-export can be called from cronjobs.
18 years ago
Simon Hausmann 9c9fec3d28 Added p4 delete behavioural emulation as todo item.
18 years ago
Simon Hausmann 90dc3dfdc8 Fix single-branch imports by skipping the branch/merge detection correctly.
18 years ago
Simon Hausmann f1e9b5345e Use sets.Set() instead of set() to run also with older versions of Python.
18 years ago
Simon Hausmann 0563a4538a Make it possible to specify the p4 changes to import through a text file (for debugging) and made various improvements to the branch/merge heuristic detection.
18 years ago
Simon Hausmann 930d3cc94e When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.
18 years ago
Simon Hausmann 77083daac7 Set git fast-import marks for every imported change for future use.
18 years ago
Simon Hausmann 53b03239aa After marking a p4 branch as merged don't ever merge it in git again.
18 years ago
Simon Hausmann dcacf8b447 More fixes in heuristic p4 branch detection based on common path components.
18 years ago
Simon Hausmann 766887e110 Started work on p4 branch detection (experimental!).
18 years ago