summaryrefslogtreecommitdiff
path: root/git-p4.py
AgeCommit message (Expand)AuthorFilesLines
2016-12-20git-p4: add diff/merge properties to .gitattributes for GitLFS filesLibravatar Lars Schneider1-2/+2
2016-12-19Merge branch 'ld/p4-worktree'Libravatar Junio C Hamano1-4/+13
2016-12-19git-p4: fix multi-path changelist empty commitsLibravatar George Vanburgh1-2/+2
2016-12-18git-p4: avoid crash adding symlinked directoryLibravatar Luke Diamand1-6/+20
2016-12-16Merge branch 'ls/p4-retry-thrice'Libravatar Junio C Hamano1-0/+5
2016-12-16Merge branch 'ls/p4-empty-file-on-lfs'Libravatar Junio C Hamano1-12/+17
2016-12-13git-p4: support git worktreesLibravatar Luke Diamand1-4/+13
2016-12-05git-p4: fix empty file processing for large file system backend GitLFSLibravatar Lars Schneider1-12/+17
2016-12-05git-p4: add config to retry p4 commands; retry 3 times by defaultLibravatar Lars Schneider1-0/+5
2016-12-05git-p4: support updating an existing shelved changelistLibravatar Luke Diamand1-4/+29
2016-11-29git-p4: allow submit to create shelved changelists.Libravatar Vinicius Kursancew1-14/+22
2016-08-11Spelling fixesLibravatar Ville Skyttä1-1/+1
2016-07-19Merge branch 'ls/p4-tmp-refs'Libravatar Junio C Hamano1-1/+1
2016-07-11Merge branch 'ao/p4-has-branch-prefix-fix' into maintLibravatar Junio C Hamano1-1/+1
2016-07-08git-p4: place temporary refs used for branch import under refs/git-p4-tmpLibravatar Lars Schneider1-1/+1
2016-07-06Merge branch 'ao/p4-has-branch-prefix-fix'Libravatar Junio C Hamano1-1/+1
2016-06-22git-p4: correct hasBranchPrefix verbose outputLibravatar Andrew Oakley1-1/+1
2016-05-10Merge branch 'ls/p4-lfs'Libravatar Junio C Hamano1-3/+10
2016-04-28git-p4: fix Git LFS pointer parsingLibravatar Lars Schneider1-3/+10
2016-04-19git-p4: add P4 jobs to git commit messageLibravatar Jan Durovec1-0/+12
2016-04-06Merge branch 'ls/p4-map-user'Libravatar Junio C Hamano1-0/+9
2016-03-15git-p4: map a P4 user to Git author name and email addressLibravatar Lars Schneider1-0/+9
2016-01-13git-p4.py: add support for filetype changeLibravatar Romain Picard1-2/+7
2015-12-28Merge branch 'sh/p4-multi-depot'Libravatar Junio C Hamano1-25/+30
2015-12-21git-p4: reduce number of server queries for fetchesLibravatar Sam Hocevar1-23/+21
2015-12-21git-p4: support multiple depot paths in p4 submitLibravatar Sam Hocevar1-2/+9
2015-12-15Merge branch 'ls/p4-keep-empty-commits'Libravatar Junio C Hamano1-17/+27
2015-12-10git-p4: add option to keep empty commitsLibravatar Lars Schneider1-17/+27
2015-12-01Merge branch 'maint'Libravatar Jeff King1-43/+57
2015-12-01Merge branch 'eg/p4-submit-catch-failure' into maintLibravatar Jeff King1-34/+37
2015-12-01Merge branch 'ld/p4-detached-head' into maintLibravatar Jeff King1-9/+20
2015-11-24git-p4: clean up after p4 submit failureLibravatar GIRARD Etienne1-34/+37
2015-11-24git-p4: work with a detached headLibravatar Luke Diamand1-7/+16
2015-11-24git-p4: add option to system() to return subshell statusLibravatar Luke Diamand1-2/+4
2015-11-03Merge branch 'ls/p4-translation-failure' into maintLibravatar Junio C Hamano1-11/+16
2015-11-03Merge branch 'ld/p4-import-labels' into maintLibravatar Junio C Hamano1-8/+17
2015-10-26Merge branch 'dk/p4-import-ctypes'Libravatar Junio C Hamano1-0/+1
2015-10-20git-p4: import the ctypes moduleLibravatar Dennis Kaarsemaker1-0/+1
2015-10-15Merge branch 'ls/p4-lfs'Libravatar Junio C Hamano1-16/+254
2015-10-15Merge branch 'ls/p4-translation-failure'Libravatar Junio C Hamano1-11/+16
2015-10-07Merge branch 'ls/p4-path-encoding'Libravatar Junio C Hamano1-0/+10
2015-10-05Merge branch 'ld/p4-import-labels'Libravatar Junio C Hamano1-8/+17
2015-10-03git-p4: add Git LFS backend for large file systemLibravatar Lars Schneider1-0/+72
2015-10-03git-p4: add support for large file systemsLibravatar Lars Schneider1-10/+129
2015-10-03git-p4: check free space during streamingLibravatar Lars Schneider1-0/+18
2015-10-03git-p4: add file streaming progress in verbose modeLibravatar Lars Schneider1-2/+18
2015-10-03git-p4: return an empty list if a list config has no valuesLibravatar Lars Schneider1-0/+2
2015-10-03git-p4: add gitConfigInt readerLibravatar Lars Schneider1-0/+11
2015-10-03git-p4: add optional type specifier to gitConfig readerLibravatar Lars Schneider1-6/+6
2015-09-22git-p4: handle "Translation of file content failed"Libravatar Lars Schneider1-11/+16