Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ls/p4-keep-empty-commits' | Junio C Hamano | 2015-12-15 | 1 | -17/+27 |
|\ | |||||
| * | git-p4: add option to 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 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 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-04 | 1 | -11/+16 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ld/p4-import-labels' into maint | Junio C Hamano | 2015-11-04 | 1 | -8/+17 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'dk/p4-import-ctypes' | Junio C Hamano | 2015-10-26 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | git-p4: import the ctypes module | Dennis Kaarsemaker | 2015-10-20 | 1 | -0/+1 |
* | | | | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2015-10-16 | 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-16 | 1 | -11/+16 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | git-p4: handle "Translation of file content failed" | 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-17 | 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 commits | 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 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 handling | 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 codepath | Miguel Torroja | 2015-05-28 | 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 |
* | | | Merge branch 'va/p4-client-path' | Junio C Hamano | 2015-05-11 | 1 | -4/+9 |
|\ \ \ | |_|/ |/| | | |||||
| * | | git-p4: improve client path detection when branches are used | Vitor Antunes | 2015-04-23 | 1 | -4/+9 |
* | | | Merge branch 'ls/p4-changes-block-size' | Junio C Hamano | 2015-05-11 | 1 | -11/+41 |
|\ \ \ | |||||
| * | | | git-p4: use -m when running p4 changes | Lex Spoon | 2015-04-20 | 1 | -11/+41 |
| |/ / | |||||
* / / | git-p4: fix filetype detection on files opened exclusively | Blair Holloway | 2015-04-04 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'ld/p4-submit-hint' | Junio C Hamano | 2015-02-11 | 1 | -1/+1 |
|\ \ | |||||
| * | | git-p4: correct --prepare-p4-only instructions | Luke Diamand | 2015-01-23 | 1 | -1/+1 |
| |/ | |||||
* / | git-p4: support excluding paths on sync | Luke Diamand | 2015-02-11 | 1 | -10/+10 |
|/ | |||||
* | git-p4: fix submit in non --prepare-p4-only mode | Maxime Coste | 2014-06-13 | 1 | -6/+6 |
* | git-p4: Do not include diff in spec file when just preparing p4 | Maxime Coste | 2014-05-27 | 1 | -23/+26 |
* | Merge branch 'cl/p4-use-diff-tree' | Junio C Hamano | 2014-05-07 | 1 | -1/+1 |
|\ | |||||
| * | git-p4: format-patch to diff-tree change breaks binary patches | Tolga Ceylan | 2014-05-07 | 1 | -1/+1 |
* | | git-p4: explicitly specify that HEAD is a revision | Vlad Dogaru | 2014-04-08 | 1 | -1/+1 |
* | | git p4: fix an error message when "p4 where" fails | Pete Wyckoff | 2014-01-22 | 1 | -1/+1 |