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

103 Commits (711544b00c22b1c2559333e8925e449812f9e5cf)
 

Author SHA1 Message Date
Simon Hausmann 711544b00c Clean up python class names.
18 years ago
Simon Hausmann 2a9489c024 Fix "compilation" :)
18 years ago
Simon Hausmann c9b50e6307 Fix the docs for git-p4 submit and turn git-p4 submit --master=foo into
18 years ago
Simon Hausmann a46668faf7 Fix variable usage in tag import
18 years ago
Simon Hausmann 1f4ba1cbfc Added support for mapping p4 labels to git tags
18 years ago
Simon Hausmann 8910ac0e88 git-p4 debug doesn't need a git repository
18 years ago
Simon Hausmann e20a9e530a Don't try to parse any options with git-p4 debug but pass it straight on to p4
18 years ago
Simon Hausmann 9863f4055e Prefer git command over git-command.
18 years ago
Simon Hausmann 274917a3d6 Minor cosmetic fixlet for the git-p4 submit sync question.
18 years ago
Simon Hausmann cb2c9db507 Different versions of p4 have different output for the where command ;(
18 years ago
Simon Hausmann 967f72e21b Use the new incremental import style by default
18 years ago
Simon Hausmann 9512497bcf Make it possible to run git-p4 submit from within the git repository
18 years ago
Simon Hausmann 179caebff4 Brand new smart incremental import that doesn't need tags or git repo-config :)
18 years ago
Simon Hausmann 569d1bd409 Set the default branch in run, not in the constructor
18 years ago
Simon Hausmann 8136a6399c Helper function to check the existance of a revision
18 years ago
Simon Hausmann 6ae8de88f5 Added some helper function(s) to parse the depot path and change number from the log message
18 years ago
Simon Hausmann f5816a5522 Changed the default branch for imports from "master" to "p4"
18 years ago
Simon Hausmann a559b289bd Changed the format of the imported log message slightly, so that it's easier to parse again.
18 years ago
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