aboutsummaryrefslogtreecommitdiff
path: root/git-p4.py
Commit message (Expand)AuthorAge
* Merge branch 'ao/p4-has-branch-prefix-fix' into maintJunio C Hamano2016-07-11
|\
| * git-p4: correct hasBranchPrefix verbose outputAndrew Oakley2016-06-22
* | Merge branch 'ls/p4-lfs'Junio C Hamano2016-05-10
|\ \
| * | git-p4: fix Git LFS pointer parsingLars Schneider2016-04-28
* | | git-p4: add P4 jobs to git commit messageJan Durovec2016-04-19
* | | Merge branch 'ls/p4-map-user'Junio C Hamano2016-04-06
|\ \ \ | |/ / |/| |
| * | git-p4: map a P4 user to Git author name and email addressLars Schneider2016-03-15
* | | git-p4.py: add support for filetype changeRomain Picard2016-01-13
|/ /
* | Merge branch 'sh/p4-multi-depot'Junio C Hamano2015-12-28
|\ \
| * | git-p4: reduce number of server queries for fetchesSam Hocevar2015-12-21
| * | git-p4: support multiple depot paths in p4 submitSam Hocevar2015-12-21
* | | Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano2015-12-15
|\ \ \ | |/ / |/| / | |/
| * git-p4: add option to keep empty commitsLars Schneider2015-12-10
* | Merge branch 'maint'Jeff King2015-12-01
|\ \
| * \ Merge branch 'eg/p4-submit-catch-failure' into maintJeff King2015-12-01
| |\ \
| | * | git-p4: clean up after p4 submit failureGIRARD Etienne2015-11-24
| * | | Merge branch 'ld/p4-detached-head' into maintJeff King2015-12-01
| |\ \ \
| | * | | git-p4: work with a detached headLuke Diamand2015-11-24
| | * | | git-p4: add option to system() to return subshell statusLuke Diamand2015-11-24
| | |/ /
| * | | Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-03
| |\ \ \
| * \ \ \ Merge branch 'ld/p4-import-labels' into maintJunio C Hamano2015-11-03
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'dk/p4-import-ctypes'Junio C Hamano2015-10-26
|\ \ \ \ \
| * | | | | git-p4: import the ctypes moduleDennis Kaarsemaker2015-10-20
* | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2015-10-15
|\ \ \ \ \ \
| * | | | | | git-p4: add Git LFS backend for large file systemLars Schneider2015-10-03
| * | | | | | git-p4: add support for large file systemsLars Schneider2015-10-03
| |/ / / / /
| * | | | | git-p4: check free space during streamingLars Schneider2015-10-03
| * | | | | git-p4: add file streaming progress in verbose modeLars Schneider2015-10-03
| * | | | | git-p4: return an empty list if a list config has no valuesLars Schneider2015-10-03
| * | | | | git-p4: add gitConfigInt readerLars Schneider2015-10-03
| * | | | | git-p4: add optional type specifier to gitConfig readerLars Schneider2015-10-03
| |/ / / /
* | | | | Merge branch 'ls/p4-translation-failure'Junio C Hamano2015-10-15
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | git-p4: handle "Translation of file content failed"Lars Schneider2015-09-22
| |/ / /
* | | | Merge branch 'ls/p4-path-encoding'Junio C Hamano2015-10-07
|\ \ \ \
| * | | | git-p4: use replacement character for non UTF-8 characters in pathsLars Schneider2015-09-21
| * | | | git-p4: improve path encoding verbose outputLars Schneider2015-09-16
| * | | | git-p4: add config git-p4.pathEncodingLars Schneider2015-09-03
* | | | | Merge branch 'ld/p4-import-labels'Junio C Hamano2015-10-05
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | git-p4: fix P4 label import for unprocessed commitsLuke Diamand2015-08-28
| * | | git-p4: do not terminate creating tag for unknown commitLuke Diamand2015-08-28
| |/ /
* | | git-p4: honor core.ignorecase when using P4 client specsLars Schneider2015-08-28
|/ /
* | Merge branch 'ld/p4-changes-block-size'Junio C Hamano2015-06-24
|\ \
| * | git-p4: fixing --changes-block-size handlingLuke Diamand2015-06-10
* | | Merge branch 'mt/p4-depotFile-at-version'Junio C Hamano2015-06-11
|\ \ \ | |/ / |/| |
| * | p4: retrieve the right revision of the file in UTF-16 codepathMiguel Torroja2015-05-27
* | | Merge branch 'ld/p4-editor-multi-words'Junio C Hamano2015-06-05
|\ \ \ | |/ / |/| |
| * | git-p4: fix handling of multi-word P4EDITORLuke Diamand2015-05-24
* | | Merge branch 'va/p4-client-path'Junio C Hamano2015-05-11
|\ \ \ | |_|/ |/| |
| * | git-p4: improve client path detection when branches are usedVitor Antunes2015-04-23
* | | Merge branch 'ls/p4-changes-block-size'Junio C Hamano2015-05-11
|\ \ \