aboutsummaryrefslogtreecommitdiffstats
path: root/git-p4.py (follow)
AgeCommit message (Expand)AuthorFilesLines
2017-01-18Merge branch 'ls/p4-retry-thrice'Junio C Hamano1-1/+3
2017-01-17Merge branch 'gv/p4-multi-path-commit-fix' into maintJunio C Hamano1-2/+2
2017-01-17Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano1-6/+20
2016-12-29git-p4: do not pass '-r 0' to p4 commandsIgor Kushnir1-1/+3
2016-12-27Merge branch 'ls/p4-lfs'Junio C Hamano1-2/+2
2016-12-27Merge branch 'gv/p4-multi-path-commit-fix'Junio C Hamano1-2/+2
2016-12-27Merge branch 'ld/p4-compare-dir-vs-symlink'Junio C Hamano1-6/+20
2016-12-20git-p4: add diff/merge properties to .gitattributes for GitLFS filesLars Schneider1-2/+2
2016-12-19Merge branch 'ld/p4-worktree'Junio C Hamano1-4/+13
2016-12-19git-p4: fix multi-path changelist empty commitsGeorge Vanburgh1-2/+2
2016-12-18git-p4: avoid crash adding symlinked directoryLuke Diamand1-6/+20
2016-12-16Merge branch 'ls/p4-retry-thrice'Junio C Hamano1-0/+5
2016-12-16Merge branch 'ls/p4-empty-file-on-lfs'Junio C Hamano1-12/+17
2016-12-13git-p4: support git worktreesLuke Diamand1-4/+13
2016-12-05git-p4: fix empty file processing for large file system backend GitLFSLars Schneider1-12/+17
2016-12-05git-p4: add config to retry p4 commands; retry 3 times by defaultLars Schneider1-0/+5
2016-12-05git-p4: support updating an existing shelved changelistLuke Diamand1-4/+29
2016-11-29git-p4: allow submit to create shelved changelists.Vinicius Kursancew1-14/+22
2016-08-11Spelling fixesVille Skyttä1-1/+1
2016-07-19Merge branch 'ls/p4-tmp-refs'Junio C Hamano1-1/+1
2016-07-11Merge branch 'ao/p4-has-branch-prefix-fix' into maintJunio C Hamano1-1/+1
2016-07-08git-p4: place temporary refs used for branch import under refs/git-p4-tmpLars Schneider1-1/+1
2016-07-06Merge branch 'ao/p4-has-branch-prefix-fix'Junio C Hamano1-1/+1
2016-06-22git-p4: correct hasBranchPrefix verbose outputAndrew Oakley1-1/+1
2016-05-10Merge branch 'ls/p4-lfs'Junio C Hamano1-3/+10
2016-04-28git-p4: fix Git LFS pointer parsingLars Schneider1-3/+10
2016-04-19git-p4: add P4 jobs to git commit messageJan Durovec1-0/+12
2016-04-06Merge branch 'ls/p4-map-user'Junio C Hamano1-0/+9
2016-03-15git-p4: map a P4 user to Git author name and email addressLars Schneider1-0/+9
2016-01-13git-p4.py: add support for filetype changeRomain Picard1-2/+7
2015-12-28Merge branch 'sh/p4-multi-depot'Junio C Hamano1-25/+30
2015-12-21git-p4: reduce number of server queries for fetchesSam Hocevar1-23/+21
2015-12-21git-p4: support multiple depot paths in p4 submitSam Hocevar1-2/+9
2015-12-15Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano1-17/+27
2015-12-10git-p4: add option to keep empty commitsLars Schneider1-17/+27
2015-12-01Merge branch 'maint'Jeff King1-43/+57
2015-12-01Merge branch 'eg/p4-submit-catch-failure' into maintJeff King1-34/+37
2015-12-01Merge branch 'ld/p4-detached-head' into maintJeff King1-9/+20
2015-11-24git-p4: clean up after p4 submit failureGIRARD Etienne1-34/+37
2015-11-24git-p4: work with a detached headLuke Diamand1-7/+16
2015-11-24git-p4: add option to system() to return subshell statusLuke Diamand1-2/+4
2015-11-03Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano1-11/+16
2015-11-03Merge branch 'ld/p4-import-labels' into maintJunio C Hamano1-8/+17
2015-10-26Merge branch 'dk/p4-import-ctypes'Junio C Hamano1-0/+1
2015-10-20git-p4: import the ctypes moduleDennis Kaarsemaker1-0/+1
2015-10-15Merge branch 'ls/p4-lfs'Junio C Hamano1-16/+254
2015-10-15Merge branch 'ls/p4-translation-failure'Junio C Hamano1-11/+16
2015-10-07Merge branch 'ls/p4-path-encoding'Junio C Hamano1-0/+10
2015-10-05Merge branch 'ld/p4-import-labels'Junio C Hamano1-8/+17
2015-10-03git-p4: add Git LFS backend for large file systemLars Schneider1-0/+72