summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-061-2/+1
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-023-23/+23
* Merge branch 'master' of git://repo.or.cz/git/fastimportJunio C Hamano2007-06-261-0/+3
|\
| * Teach bash how to complete +refspec on git-pushShawn O. Pearce2007-06-241-0/+3
* | git-new-workdir: Fix shell warning about operator == used with test.Simon Hausmann2007-06-261-1/+1
|/
* new-workdir: handle rev-parse --git-dir not always giving full pathJulian Phillips2007-06-241-0/+5
* Import branch 'git-p4' of git://repo.or.cz/fast-exportShawn O. Pearce2007-06-223-0/+1737
|\
| * Make it possible to specify the HEAD for the internal findUpstreamBranchPoint...Simon Hausmann2007-06-221-2/+2
| * Added git-p4 branches command that shows the mapping of perforce depot paths ...Simon Hausmann2007-06-201-1/+27
| * Warn about conflicting p4 branch mappings and use the first one found.Simon Hausmann2007-06-171-0/+6
| * Fix the branch mapping detection to be independent from the order of the "p4 ...Simon Hausmann2007-06-171-3/+13
| * git-p4 fails when cloning a p4 depo.Benjamin Sergeant2007-06-161-3/+17
| * Fix initial multi-branch import.Simon Hausmann2007-06-161-0/+1
| * Only use double quotes on WindowsMarius Storm-Olsen2007-06-121-1/+1
| * Fix git-p4 rebase to detect the correct upstream branch instead of unconditio...Simon Hausmann2007-06-121-2/+10
| * Moved the code from git-p4 submit to figure out the upstream branch pointSimon Hausmann2007-06-121-19/+26
| * git-p4 submit: Fix missing quotes around p4 commands to make them work with s...Simon Hausmann2007-06-111-3/+3
| * Mention remotes/p4/master also in the documentation.Simon Hausmann2007-06-111-3/+3
| * Provide some information for single branch imports where the commits goSimon Hausmann2007-06-111-1/+4
| * git-p4: check for existence of repo dir before trying to createKevin Green2007-06-111-1/+2
| * Write out the options tag in the log message of imports only if we actually haveSimon Hausmann2007-06-111-6/+5
| * Fix support for explicit disabling of syncing with the originSimon Hausmann2007-06-111-0/+2
| * Fix depot-paths encoding for multi-path imports (don't split up //depot/path/...Simon Hausmann2007-06-111-1/+1
| * Fix project name guessingSimon Hausmann2007-06-111-1/+6
| * Fix updating/creating remotes/p4/* heads from origin/p4/*Simon Hausmann2007-06-101-4/+6
| * Fixed the check to make sure to exclude the HEAD symbolic refs when updatingSimon Hausmann2007-06-101-1/+1
| * also strip p4/ from local imports.Han-Wen Nienhuys2007-06-081-3/+3
| * Merge branch 'master' of git://repo.or.cz/fast-exportHan-Wen Nienhuys2007-06-081-32/+57
| |\
| | * Only get the expensive branch mapping from the p4 server when notSimon Hausmann2007-06-081-5/+5
| | * Make git-p4 submit detect the correct reference (origin) branch whenSimon Hausmann2007-06-071-14/+24
| | * Make clone behave like git clone by default again.Simon Hausmann2007-06-071-0/+5
| | * Exclude the HEAD symbolic ref from the list of known branchesMarius Storm-Olsen2007-06-071-1/+1
| | * Fix single branch import into remotesMarius Storm-Olsen2007-06-071-2/+2
| | * Fix git-p4 clone (defaultDestination)Marius Storm-Olsen2007-06-071-1/+1
| | * Ensure that the commit message is Windows formated (CRLF) before invoking the...Marius Storm-Olsen2007-06-071-0/+5
| | * Fix depot-path determination for git-p4 submitSimon Hausmann2007-06-071-1/+1
| | * Fix git-p4 submitSimon Hausmann2007-06-071-3/+1
| | * Fix git-p4 rebaseSimon Hausmann2007-06-071-0/+1
| | * Hack to make the multi-branch import work again with self.depotPaths now thatSimon Hausmann2007-06-071-3/+4
| | * Don't attempt to set the initialParent on multi-branch imports (useless).Simon Hausmann2007-06-071-1/+2
| | * Fix common path "calculation" from logs of multiple branches.Simon Hausmann2007-06-071-2/+3
| | * Fix support for "depot-path" in older git-p4 importsSimon Hausmann2007-06-071-1/+4
| * | print error message when p4 print fails (eg. due to permission problems)Han-Wen Nienhuys2007-06-081-0/+5
| |/
| * look for 'text' and 'binary' files.Han-Wen Nienhuys2007-06-051-2/+3
| * thinko: really ignore deleted files.Han-Wen Nienhuys2007-05-311-10/+18
| * remove debug printHan-Wen Nienhuys2007-05-311-1/+0
| * Cleanups & import into p4/master for local importHan-Wen Nienhuys2007-05-311-22/+32
| * use p4CmdList() to get file contents in Python dicts. This is more robust.Han-Wen Nienhuys2007-05-311-35/+21
| * only run p4 print if necessaryHan-Wen Nienhuys2007-05-301-0/+3
| * don't p4 print deleted files.Han-Wen Nienhuys2007-05-301-8/+13
View Lorry Controller Status