summaryrefslogtreecommitdiff
path: root/contrib
AgeCommit message (Expand)AuthorFilesLines
2007-03-19Part of the code is copyright by Trolltech ASA.Simon Hausmann1-0/+2
2007-03-19First (untested) attempt at migrating p4-git-sync into the final git-p4 scriptSimon Hausmann1-3/+240
2007-03-19Provide a little bit of help description for the git-p4 "tools".Simon Hausmann1-1/+4
2007-03-19Start moving the git-p4 tools into one single script.Simon Hausmann3-68/+115
2007-03-19Pass the right number of arguments to commit, fixes single-branch imports.Simon Hausmann1-2/+2
2007-03-19Improved the git dir detection.Simon Hausmann1-0/+13
2007-03-19git.el: Add support for commit hooks.Alexandre Julliard1-24/+57
2007-03-17Make gc a builtin.James Bowes1-0/+37
2007-03-16Default to interactive syncingSimon Hausmann1-4/+4
2007-03-15Use p4 revert ... instead of revert -a ... after submitting, to make sure the...Simon Hausmann1-3/+3
2007-03-14Auto-detect the current git branch before submitting back to perforce.Simon Hausmann1-4/+11
2007-03-14Ignore Apple resource files when importing from perforce to git.Simon Hausmann1-0/+4
2007-03-14Be nice and use /usr/bin/env python for the git-p4 scriptsSimon Hausmann2-2/+2
2007-03-14Automatically operate on a temporary branch, needed for cherry-pick to work w...Simon Hausmann1-1/+9
2007-03-13Lots of bugfixes to p4-git-sync.Simon Hausmann1-17/+73
2007-03-13Fix git-dir option and allow reading log substitutions from a fileSimon Hausmann1-2/+6
2007-03-12First version of a new script to submit changes back to perforce from git rep...Simon Hausmann1-0/+208
2007-03-10Merge branch 'maint'Junio C Hamano1-24/+65
2007-03-10git.el: Retrieve commit log information from .dotest directory.Alexandre Julliard1-24/+53
2007-03-10git.el: Avoid appending a signoff line that is already present.Alexandre Julliard1-6/+18
2007-03-10Split up the cache commandline options into (command) cache and data cache.Simon Hausmann1-8/+12
2007-03-10Reduce the number of false "merges" by skipping "branch from" entries in the ...Simon Hausmann1-1/+7
2007-03-10More work on branch detection by implementing changeIsBranchMerge().Simon Hausmann1-35/+96
2007-03-10More code cleanups and preparations for more branch detection heuristics.Simon Hausmann1-1/+60
2007-03-10Minor code cleanups.Simon Hausmann1-1/+14
2007-03-10Make the p4 data/command cache configurable through the --cache-debug command...Simon Hausmann1-1/+4
2007-03-10Fixed p4-debug file extension.Simon Hausmann1-0/+0
2007-03-08Changed --known-branches to take a file as argument instead of a comma separa...Simon Hausmann1-2/+2
2007-03-08Work in progress on detecting branches.Simon Hausmann1-57/+103
2007-03-07Adjust the output parsing of git name-rev to handle the output of the latest ...Simon Hausmann1-1/+4
2007-03-05contrib/emacs: Use non-interactive function to byte-compile filesXavier Maillard1-2/+2
2007-02-28Merge branch 'maint'Junio C Hamano1-6/+18
2007-02-28git.el: Set the default commit coding system from the repository config.Alexandre Julliard1-6/+18
2007-02-27Merge branch 'maint'Junio C Hamano1-1/+1
2007-02-27blameview: Fix the browse behavior in blameviewAneesh Kumar1-1/+1
2007-02-22Don't print a plain newline at the end of the execution (avoids bogus cron er...Simon Hausmann1-2/+0
2007-02-22More work in --silent support.Simon Hausmann1-1/+2
2007-02-22Added support for --silent so that p4-fast-export can be called from cronjobs.Simon Hausmann1-7/+15
2007-02-21Merge branch 'maint'Junio C Hamano1-3/+6
2007-02-21Added p4 delete behavioural emulation as todo item.Simon Hausmann1-0/+2
2007-02-21Use gunzip -c over gzcat in import-tars example.Michael Loeffler1-3/+6
2007-02-18Fix single-branch imports by skipping the branch/merge detection correctly.Simon Hausmann1-1/+1
2007-02-15Use sets.Set() instead of set() to run also with older versions of Python.Simon Hausmann1-6/+7
2007-02-14Make it possible to specify the p4 changes to import through a text file (for...Simon Hausmann1-38/+90
2007-02-12Remove git-diff-stages.Junio C Hamano1-1/+0
2007-02-12Remove git-resolve.Junio C Hamano2-1/+112
2007-02-12blameview: Move the commit info to a pane below the blame window.Aneesh Kumar K.V1-7/+26
2007-02-12When trying to map p4 integrations to git merges just record it as a single m...Simon Hausmann1-7/+23
2007-02-12Set git fast-import marks for every imported change for future use.Simon Hausmann1-0/+1
2007-02-12After marking a p4 branch as merged don't ever merge it in git again.Simon Hausmann1-1/+4