summaryrefslogtreecommitdiff
path: root/contrib/fast-import
Commit message (Expand)AuthorAgeFilesLines
* git-p4: replace each tab with 8 spaces for consistencyAndrew Garber2011-04-071-32/+32
* Merge branch 'pw/p4'Junio C Hamano2011-03-231-1/+3
|\
| * git-p4: fix sync new branch regressionPete Wyckoff2011-03-161-1/+3
* | git-p4: Fix error message crash in P4Sync.commit.Tor Arvid Lund2011-03-151-1/+1
* | Teach git-p4 to ignore case in perforce filenames if configured.Tor Arvid Lund2011-03-151-7/+20
* | git-p4: Teach gitConfig method about arguments.Tor Arvid Lund2011-03-151-2/+6
* | Merge branch 'pw/p4'Junio C Hamano2011-03-131-1/+1
|\ \ | |/
| * git-p4: fix clone @all regressionPete Wyckoff2011-03-131-1/+1
* | Merge branch 'mh/p4'Junio C Hamano2011-03-041-1/+1
|\ \
| * | git-p4 submit: prevent 'Jobs' section from being removed from p4 change logMichael Horowitz2011-02-251-1/+1
* | | Merge branch 'va/p4'Junio C Hamano2011-02-271-4/+31
|\ \ \
| * | | git-p4: Add copy detection supportVitor Antunes2011-02-211-0/+16
| * | | git-p4: Improve rename detection supportVitor Antunes2011-02-211-4/+15
* | | | Merge branch 'pw/p4'Junio C Hamano2011-02-271-11/+49
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | git-p4: support clone --barePete Wyckoff2011-02-211-4/+13
| * | git-p4: decode p4 wildcard charactersPete Wyckoff2011-02-211-0/+18
| * | git-p4: better message for "git-p4 sync" when not clonedPete Wyckoff2011-02-211-0/+2
| * | git-p4: reinterpret confusing p4 messagePete Wyckoff2011-02-211-0/+4
| * | git-p4: accommodate new move/delete type in p4Pete Wyckoff2011-02-211-5/+7
| * | git-p4: add missing newline in initial import messagePete Wyckoff2011-02-211-1/+1
| * | git-p4: fix key error for p4 problemPete Wyckoff2011-02-211-1/+4
| |/
* | 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
View Lorry Controller Status