summaryrefslogtreecommitdiff
path: root/contrib/fast-import
Commit message (Expand)AuthorAgeFilesLines
* Obey p4 views when using client specIan Wienand2011-02-142-4/+51
* Merge branch 'aw/git-p4-deletion'Junio C Hamano2010-11-051-1/+3
|\
| * Fix handling of git-p4 on deleted filesAndrew Waters2010-10-221-1/+3
* | perl: use "use warnings" instead of -wÆvar Arnfjörð Bjarmason2010-09-271-1/+2
|/
* Merge branch 'rb/maint-python-path'Junio C Hamano2010-04-031-1/+1
|\
| * Correct references to /usr/bin/python which does not exist on FreeBSDR. Tyler Ballance2010-03-241-1/+1
* | Fix a spelling mistake in a git-p4 console messageBenjamin C Meyer2010-03-201-1/+1
|/
* git-p4: fix bug in symlink handlingEvan Powers2010-02-201-3/+2
* Typofixes outside documentation areaJunio C Hamano2010-02-031-1/+1
* git-p4: Fix sync errors due to new server versionPal-Kristian Engstad2010-02-011-1/+1
* fix git-p4 editor invocationNicolas Pitre2010-01-211-1/+1
* add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"Jonathan Nieder2009-11-131-4/+1
* import-tars: Add support for tarballs compressed with lzma, xzIngmar Vanhassel2009-10-211-1/+4
* import-tars: Add missing closing bracketIngmar Vanhassel2009-10-091-1/+1
* Merge branch 'pk/fast-import-tars'Junio C Hamano2009-09-131-4/+46
|\
| * import-tars: Allow per-tar author and commit message.Peter Krefting2009-09-031-4/+46
* | Merge branch 'pk/fast-import-dirs'Junio C Hamano2009-09-131-0/+416
|\ \
| * | Add script for importing bits-and-pieces to Git.Peter Krefting2009-09-031-0/+416
| |/
* | git-p4: Avoid modules deprecated in Python 2.6.Reilly Grant2009-09-101-7/+5
|/
* git-p4: stream from perforce to speed up clonesLuke Diamand2009-08-101-67/+102
* import-tars: support symlinksJohannes Schindelin2009-06-181-5/+12
* Merge branch 'maint'Junio C Hamano2009-03-291-1/+2
|\
| * Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-03-291-1/+2
| |\
| | * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-03-291-1/+2
| | |\
| | | * import-zips: fix thinkoJohannes Schindelin2009-03-291-1/+2
* | | | import-tars: separate author from committerGiuseppe Bilotta2009-03-201-5/+11
* | | | git-p4: remove tabs from usermap filePete Wyckoff2009-03-071-1/+1
|/ / /
* | | git-p4: avoid syncing duplicate changesPete Wyckoff2009-02-231-5/+6
|/ /
* | git-p4: Fix regression in p4Where method.Tor Arvid Lund2008-12-091-3/+10
* | git-p4: Fix bug in p4Where method.Tor Arvid Lund2008-12-041-1/+9
* | Merge branch 'maint'Junio C Hamano2008-11-271-1/+1
|\ \ | |/
| * git-p4: fix keyword-expansion regexPete Wyckoff2008-11-271-1/+1
* | git-p4: Cache git config for performanceJohn Chapman2008-11-111-1/+4
* | git-p4: Support purged files and optimize memory usageJohn Chapman2008-11-111-7/+7
* | git-p4: Fix checkout bug when using --import-local.Tor Arvid Lund2008-08-291-2/+6
* | Make it possible to abort the submission of a change to PerforceSimon Hausmann2008-08-271-8/+23
|/
* Clean up the git-p4 documentationSimon Hausmann2008-08-241-31/+38
* git-p4: Fix one-liner in p4_write_pipe function.Tor Arvid Lund2008-08-221-1/+1
* Merge branch 'ak/p4'Junio C Hamano2008-08-172-28/+124
|\
| * Utilise our new p4_read_pipe and p4_write_pipe wrappersAnand Kumria2008-08-141-3/+3
| * Add p4 read_pipe and write_pipe wrappersAnand Kumria2008-08-141-0/+7
| * Put in the two other configuration elements found in the sourceAnand Kumria2008-08-111-0/+8
| * Put some documentation in about the parameters that have been addedAnand Kumria2008-08-111-0/+32
| * Move git-p4.syncFromOrigin into a configuration parameters sectionAnand Kumria2008-08-111-12/+16
| * Consistently use 'git-p4' for the configuration entriesAnand Kumria2008-08-111-1/+1
| * If the user has configured various parameters, use them.Anand Kumria2008-08-111-1/+23
| * Switch to using 'p4_build_cmd'Anand Kumria2008-08-111-7/+3
| * If we are in verbose mode, output what we are about to run (or return)Anand Kumria2008-08-111-0/+2
| * Add a single command that will be used to construct the 'p4' commandAnand Kumria2008-08-111-0/+11
| * Utilise the new 'p4_system' function.Anand Kumria2008-08-111-9/+9