summaryrefslogtreecommitdiff
path: root/git-p4.py
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ls/p4-lfs'Junio C Hamano2016-12-271-2/+2
|\
| * git-p4: add diff/merge properties to .gitattributes for GitLFS filesls/p4-lfsLars Schneider2016-12-201-2/+2
* | Merge branch 'gv/p4-multi-path-commit-fix'Junio C Hamano2016-12-271-2/+2
|\ \
| * | git-p4: fix multi-path changelist empty commitsgv/p4-multi-path-commit-fixGeorge Vanburgh2016-12-191-2/+2
| * | Merge branch 'ao/p4-has-branch-prefix-fix' into maintJunio C Hamano2016-07-111-1/+1
| |\ \
* | \ \ Merge branch 'ld/p4-compare-dir-vs-symlink'Junio C Hamano2016-12-271-6/+20
|\ \ \ \
| * | | | git-p4: avoid crash adding symlinked directoryld/p4-compare-dir-vs-symlinkLuke Diamand2016-12-181-6/+20
* | | | | Merge branch 'ld/p4-worktree'Junio C Hamano2016-12-191-4/+13
|\ \ \ \ \
| * | | | | git-p4: support git worktreesld/p4-worktreeLuke Diamand2016-12-131-4/+13
| |/ / / /
* | | | | Merge branch 'ls/p4-retry-thrice'Junio C Hamano2016-12-161-0/+5
|\ \ \ \ \
| * | | | | git-p4: add config to retry p4 commands; retry 3 times by defaultLars Schneider2016-12-051-0/+5
| |/ / / /
* | | | | Merge branch 'ls/p4-empty-file-on-lfs'Junio C Hamano2016-12-161-12/+17
|\ \ \ \ \
| * | | | | git-p4: fix empty file processing for large file system backend GitLFSls/p4-empty-file-on-lfsLars Schneider2016-12-051-12/+17
| |/ / / /
* | | | | git-p4: support updating an existing shelved changelistld/p4-update-shelveLuke Diamand2016-12-051-4/+29
* | | | | git-p4: allow submit to create shelved changelists.vk/p4-submit-shelveVinicius Kursancew2016-11-291-14/+22
|/ / / /
* | | | Spelling fixesvs/typofixVille Skyttä2016-08-111-1/+1
* | | | Merge branch 'ls/p4-tmp-refs'Junio C Hamano2016-07-191-1/+1
|\ \ \ \
| * | | | git-p4: place temporary refs used for branch import under refs/git-p4-tmpls/p4-tmp-refsLars Schneider2016-07-081-1/+1
| |/ / /
* | | | Merge branch 'ao/p4-has-branch-prefix-fix'Junio C Hamano2016-07-061-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | git-p4: correct hasBranchPrefix verbose outputao/p4-has-branch-prefix-fixAndrew Oakley2016-06-221-1/+1
* | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-05-101-3/+10
|\ \ \ | | |/ | |/|
| * | git-p4: fix Git LFS pointer parsingLars Schneider2016-04-281-3/+10
* | | git-p4: add P4 jobs to git commit messagejd/p4-jobs-in-commitJan Durovec2016-04-191-0/+12
* | | Merge branch 'ls/p4-map-user'Junio C Hamano2016-04-061-0/+9
|\ \ \ | |/ / |/| |
| * | git-p4: map a P4 user to Git author name and email addressls/p4-map-userLars Schneider2016-03-151-0/+9
* | | git-p4.py: add support for filetype changerp/p4-filetype-changeRomain Picard2016-01-131-2/+7
|/ /
* | Merge branch 'sh/p4-multi-depot'Junio C Hamano2015-12-281-25/+30
|\ \
| * | git-p4: reduce number of server queries for fetchessh/p4-multi-depotSam Hocevar2015-12-211-23/+21
| * | git-p4: support multiple depot paths in p4 submitSam Hocevar2015-12-211-2/+9
* | | Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano2015-12-151-17/+27
|\ \ \ | |/ / |/| / | |/
| * git-p4: add option to keep empty commitsls/p4-keep-empty-commitsLars Schneider2015-12-101-17/+27
* | Merge branch 'maint'Jeff King2015-12-011-43/+57
|\ \
| * \ Merge branch 'eg/p4-submit-catch-failure' into maintJeff King2015-12-011-34/+37
| |\ \
| | * | git-p4: clean up after p4 submit failureeg/p4-submit-catch-failureGIRARD Etienne2015-11-241-34/+37
| * | | Merge branch 'ld/p4-detached-head' into maintJeff King2015-12-011-9/+20
| |\ \ \
| | * | | git-p4: work with a detached headld/p4-detached-headLuke Diamand2015-11-241-7/+16
| | * | | git-p4: add option to system() to return subshell statusLuke Diamand2015-11-241-2/+4
| | |/ /
| * | | Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-031-11/+16
| |\ \ \
| * \ \ \ Merge branch 'ld/p4-import-labels' into maintJunio C Hamano2015-11-031-8/+17
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'dk/p4-import-ctypes'Junio C Hamano2015-10-261-0/+1
|\ \ \ \ \
| * | | | | git-p4: import the ctypes moduledk/p4-import-ctypesDennis Kaarsemaker2015-10-201-0/+1
* | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2015-10-151-16/+254
|\ \ \ \ \ \
| * | | | | | git-p4: add Git LFS backend for large file systemLars Schneider2015-10-031-0/+72
| * | | | | | git-p4: add support for large file systemsLars Schneider2015-10-031-10/+129
| |/ / / / /
| * | | | | git-p4: check free space during streamingLars Schneider2015-10-031-0/+18
| * | | | | git-p4: add file streaming progress in verbose modeLars Schneider2015-10-031-2/+18
| * | | | | git-p4: return an empty list if a list config has no valuesLars Schneider2015-10-031-0/+2
| * | | | | git-p4: add gitConfigInt readerLars Schneider2015-10-031-0/+11
| * | | | | git-p4: add optional type specifier to gitConfig readerLars Schneider2015-10-031-6/+6
| |/ / / /
* | | | | Merge branch 'ls/p4-translation-failure'Junio C Hamano2015-10-151-11/+16
|\ \ \ \ \ | | |_|/ / | |/| | |
View Lorry Controller Status