| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'pw/p4' | Junio C Hamano | 2011-03-13 | 1 | -1/+1 |
|\ |
|
| * | git-p4: fix clone @all regression | Pete Wyckoff | 2011-03-13 | 1 | -1/+1 |
* | | Merge branch 'mh/p4' | Junio C Hamano | 2011-03-04 | 1 | -1/+1 |
|\ \ |
|
| * | | git-p4 submit: prevent 'Jobs' section from being removed from p4 change log | Michael Horowitz | 2011-02-25 | 1 | -1/+1 |
* | | | Merge branch 'va/p4' | Junio C Hamano | 2011-02-27 | 1 | -4/+31 |
|\ \ \ |
|
| * | | | git-p4: Add copy detection support | Vitor Antunes | 2011-02-21 | 1 | -0/+16 |
| * | | | git-p4: Improve rename detection support | Vitor Antunes | 2011-02-21 | 1 | -4/+15 |
* | | | | Merge branch 'pw/p4' | Junio C Hamano | 2011-02-27 | 1 | -11/+49 |
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/| |
|
| * | | git-p4: support clone --bare | Pete Wyckoff | 2011-02-21 | 1 | -4/+13 |
| * | | git-p4: decode p4 wildcard characters | Pete Wyckoff | 2011-02-21 | 1 | -0/+18 |
| * | | git-p4: better message for "git-p4 sync" when not cloned | Pete Wyckoff | 2011-02-21 | 1 | -0/+2 |
| * | | git-p4: reinterpret confusing p4 message | Pete Wyckoff | 2011-02-21 | 1 | -0/+4 |
| * | | git-p4: accommodate new move/delete type in p4 | Pete Wyckoff | 2011-02-21 | 1 | -5/+7 |
| * | | git-p4: add missing newline in initial import message | Pete Wyckoff | 2011-02-21 | 1 | -1/+1 |
| * | | git-p4: fix key error for p4 problem | Pete Wyckoff | 2011-02-21 | 1 | -1/+4 |
| |/ |
|
* | | Obey p4 views when using client spec | Ian Wienand | 2011-02-14 | 2 | -4/+51 |
|/ |
|
* | Merge branch 'aw/git-p4-deletion' | Junio C Hamano | 2010-11-05 | 1 | -1/+3 |
|\ |
|
| * | Fix handling of git-p4 on deleted files | Andrew Waters | 2010-10-22 | 1 | -1/+3 |
* | | perl: use "use warnings" instead of -w | Ævar Arnfjörð Bjarmason | 2010-09-27 | 1 | -1/+2 |
|/ |
|
* | Merge branch 'rb/maint-python-path' | Junio C Hamano | 2010-04-03 | 1 | -1/+1 |
|\ |
|
| * | Correct references to /usr/bin/python which does not exist on FreeBSD | R. Tyler Ballance | 2010-03-24 | 1 | -1/+1 |
* | | Fix a spelling mistake in a git-p4 console message | Benjamin C Meyer | 2010-03-20 | 1 | -1/+1 |
|/ |
|
* | git-p4: fix bug in symlink handling | Evan Powers | 2010-02-20 | 1 | -3/+2 |
* | Typofixes outside documentation area | Junio C Hamano | 2010-02-03 | 1 | -1/+1 |
* | git-p4: Fix sync errors due to new server version | Pal-Kristian Engstad | 2010-02-01 | 1 | -1/+1 |
* | fix git-p4 editor invocation | Nicolas Pitre | 2010-01-21 | 1 | -1/+1 |
* | add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR" | Jonathan Nieder | 2009-11-13 | 1 | -4/+1 |
* | import-tars: Add support for tarballs compressed with lzma, xz | Ingmar Vanhassel | 2009-10-21 | 1 | -1/+4 |
* | import-tars: Add missing closing bracket | Ingmar Vanhassel | 2009-10-09 | 1 | -1/+1 |
* | Merge branch 'pk/fast-import-tars' | Junio C Hamano | 2009-09-13 | 1 | -4/+46 |
|\ |
|
| * | import-tars: Allow per-tar author and commit message. | Peter Krefting | 2009-09-03 | 1 | -4/+46 |
* | | Merge branch 'pk/fast-import-dirs' | Junio C Hamano | 2009-09-13 | 1 | -0/+416 |
|\ \ |
|
| * | | Add script for importing bits-and-pieces to Git. | Peter Krefting | 2009-09-03 | 1 | -0/+416 |
| |/ |
|
* | | git-p4: Avoid modules deprecated in Python 2.6. | Reilly Grant | 2009-09-10 | 1 | -7/+5 |
|/ |
|
* | git-p4: stream from perforce to speed up clones | Luke Diamand | 2009-08-10 | 1 | -67/+102 |
* | import-tars: support symlinks | Johannes Schindelin | 2009-06-18 | 1 | -5/+12 |
* | Merge branch 'maint' | Junio C Hamano | 2009-03-29 | 1 | -1/+2 |
|\ |
|
| * | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-03-29 | 1 | -1/+2 |
| |\ |
|
| | * | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-03-29 | 1 | -1/+2 |
| | |\ |
|
| | | * | import-zips: fix thinko | Johannes Schindelin | 2009-03-29 | 1 | -1/+2 |
* | | | | import-tars: separate author from committer | Giuseppe Bilotta | 2009-03-20 | 1 | -5/+11 |
* | | | | git-p4: remove tabs from usermap file | Pete Wyckoff | 2009-03-07 | 1 | -1/+1 |
|/ / / |
|
* | | | git-p4: avoid syncing duplicate changes | Pete Wyckoff | 2009-02-23 | 1 | -5/+6 |
|/ / |
|
* | | git-p4: Fix regression in p4Where method. | Tor Arvid Lund | 2008-12-09 | 1 | -3/+10 |
* | | git-p4: Fix bug in p4Where method. | Tor Arvid Lund | 2008-12-04 | 1 | -1/+9 |
* | | Merge branch 'maint' | Junio C Hamano | 2008-11-27 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | git-p4: fix keyword-expansion regex | Pete Wyckoff | 2008-11-27 | 1 | -1/+1 |
* | | git-p4: Cache git config for performance | John Chapman | 2008-11-11 | 1 | -1/+4 |
* | | git-p4: Support purged files and optimize memory usage | John Chapman | 2008-11-11 | 1 | -7/+7 |
* | | git-p4: Fix checkout bug when using --import-local. | Tor Arvid Lund | 2008-08-29 | 1 | -2/+6 |