| Commit message (Expand) | Author | Age | Files | Lines |
* | Spelling fixesvs/typofix | Ville Skyttä | 2016-08-11 | 1 | -1/+1 |
* | Merge branch 'ls/p4-tmp-refs' | Junio C Hamano | 2016-07-19 | 1 | -1/+1 |
|\ |
|
| * | git-p4: place temporary refs used for branch import under refs/git-p4-tmpls/p4-tmp-refs | Lars Schneider | 2016-07-08 | 1 | -1/+1 |
* | | Merge branch 'ao/p4-has-branch-prefix-fix' | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | git-p4: correct hasBranchPrefix verbose outputao/p4-has-branch-prefix-fix | Andrew Oakley | 2016-06-22 | 1 | -1/+1 |
* | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2016-05-10 | 1 | -3/+10 |
|\ \ |
|
| * | | git-p4: fix Git LFS pointer parsing | Lars Schneider | 2016-04-28 | 1 | -3/+10 |
* | | | git-p4: add P4 jobs to git commit messagejd/p4-jobs-in-commit | Jan Durovec | 2016-04-19 | 1 | -0/+12 |
* | | | Merge branch 'ls/p4-map-user' | Junio C Hamano | 2016-04-06 | 1 | -0/+9 |
|\ \ \
| |/ /
|/| | |
|
| * | | git-p4: map a P4 user to Git author name and email addressls/p4-map-user | Lars Schneider | 2016-03-15 | 1 | -0/+9 |
* | | | git-p4.py: add support for filetype changerp/p4-filetype-change | Romain Picard | 2016-01-13 | 1 | -2/+7 |
|/ / |
|
* | | Merge branch 'sh/p4-multi-depot' | Junio C Hamano | 2015-12-28 | 1 | -25/+30 |
|\ \ |
|
| * | | git-p4: reduce number of server queries for fetchessh/p4-multi-depot | Sam Hocevar | 2015-12-21 | 1 | -23/+21 |
| * | | git-p4: support multiple depot paths in p4 submit | Sam Hocevar | 2015-12-21 | 1 | -2/+9 |
* | | | Merge branch 'ls/p4-keep-empty-commits' | Junio C Hamano | 2015-12-15 | 1 | -17/+27 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | git-p4: add option to keep empty commitsls/p4-keep-empty-commits | Lars Schneider | 2015-12-10 | 1 | -17/+27 |
* | | Merge branch 'maint' | Jeff King | 2015-12-01 | 1 | -43/+57 |
|\ \ |
|
| * \ | Merge branch 'eg/p4-submit-catch-failure' into maint | Jeff King | 2015-12-01 | 1 | -34/+37 |
| |\ \ |
|
| | * | | git-p4: clean up after p4 submit failureeg/p4-submit-catch-failure | GIRARD Etienne | 2015-11-24 | 1 | -34/+37 |
| * | | | Merge branch 'ld/p4-detached-head' into maint | Jeff King | 2015-12-01 | 1 | -9/+20 |
| |\ \ \ |
|
| | * | | | git-p4: work with a detached headld/p4-detached-head | Luke Diamand | 2015-11-24 | 1 | -7/+16 |
| | * | | | git-p4: add option to system() to return subshell status | Luke Diamand | 2015-11-24 | 1 | -2/+4 |
| | |/ / |
|
| * | | | Merge branch 'ls/p4-translation-failure' into maint | Junio C Hamano | 2015-11-03 | 1 | -11/+16 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'ld/p4-import-labels' into maint | Junio C Hamano | 2015-11-03 | 1 | -8/+17 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
* | | | | | Merge branch 'dk/p4-import-ctypes' | Junio C Hamano | 2015-10-26 | 1 | -0/+1 |
|\ \ \ \ \ |
|
| * | | | | | git-p4: import the ctypes moduledk/p4-import-ctypes | Dennis Kaarsemaker | 2015-10-20 | 1 | -0/+1 |
* | | | | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2015-10-15 | 1 | -16/+254 |
|\ \ \ \ \ \ |
|
| * | | | | | | git-p4: add Git LFS backend for large file system | Lars Schneider | 2015-10-03 | 1 | -0/+72 |
| * | | | | | | git-p4: add support for large file systems | Lars Schneider | 2015-10-03 | 1 | -10/+129 |
| |/ / / / / |
|
| * | | | | | git-p4: check free space during streaming | Lars Schneider | 2015-10-03 | 1 | -0/+18 |
| * | | | | | git-p4: add file streaming progress in verbose mode | Lars Schneider | 2015-10-03 | 1 | -2/+18 |
| * | | | | | git-p4: return an empty list if a list config has no values | Lars Schneider | 2015-10-03 | 1 | -0/+2 |
| * | | | | | git-p4: add gitConfigInt reader | Lars Schneider | 2015-10-03 | 1 | -0/+11 |
| * | | | | | git-p4: add optional type specifier to gitConfig reader | Lars Schneider | 2015-10-03 | 1 | -6/+6 |
| |/ / / / |
|
* | | | | | Merge branch 'ls/p4-translation-failure' | Junio C Hamano | 2015-10-15 | 1 | -11/+16 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | git-p4: handle "Translation of file content failed"ls/p4-translation-failure | Lars Schneider | 2015-09-22 | 1 | -11/+16 |
| |/ / / |
|
* | | | | Merge branch 'ls/p4-path-encoding' | Junio C Hamano | 2015-10-07 | 1 | -0/+10 |
|\ \ \ \ |
|
| * | | | | git-p4: use replacement character for non UTF-8 characters in paths | Lars Schneider | 2015-09-21 | 1 | -1/+1 |
| * | | | | git-p4: improve path encoding verbose output | Lars Schneider | 2015-09-16 | 1 | -10/+9 |
| * | | | | git-p4: add config git-p4.pathEncoding | Lars Schneider | 2015-09-03 | 1 | -0/+11 |
* | | | | | Merge branch 'ld/p4-import-labels' | Junio C Hamano | 2015-10-05 | 1 | -8/+17 |
|\ \ \ \ \
| |_|/ / /
|/| | / /
| | |/ /
| |/| | |
|
| * | | | git-p4: fix P4 label import for unprocessed commitsld/p4-import-labels | Luke Diamand | 2015-08-28 | 1 | -8/+17 |
| * | | | git-p4: do not terminate creating tag for unknown commit | Luke Diamand | 2015-08-28 | 1 | -2/+2 |
| |/ / |
|
* | | | git-p4: honor core.ignorecase when using P4 client specsls/p4-fold-case-client-specs | Lars Schneider | 2015-08-28 | 1 | -0/+7 |
|/ / |
|
* | | Merge branch 'ld/p4-changes-block-size' | Junio C Hamano | 2015-06-24 | 1 | -22/+63 |
|\ \ |
|
| * | | git-p4: fixing --changes-block-size handlingld/p4-changes-block-size | Luke Diamand | 2015-06-10 | 1 | -22/+63 |
* | | | Merge branch 'mt/p4-depotFile-at-version' | Junio C Hamano | 2015-06-11 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | p4: retrieve the right revision of the file in UTF-16 codepathmt/p4-depotFile-at-version | Miguel Torroja | 2015-05-27 | 1 | -1/+1 |
* | | | Merge branch 'ld/p4-editor-multi-words' | Junio C Hamano | 2015-06-05 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | git-p4: fix handling of multi-word P4EDITOR | Luke Diamand | 2015-05-24 | 1 | -1/+1 |