summaryrefslogtreecommitdiff
path: root/git-p4.py
AgeCommit message (Expand)AuthorFilesLines
2018-06-01Merge branch 'ld/p4-unshelve'Libravatar Junio C Hamano1-36/+177
2018-05-24git-p4: add unshelve commandLibravatar Luke Diamand1-36/+177
2018-05-11git-p4: change "commitish" typo to "committish"Libravatar Ævar Arnfjörð Bjarmason1-3/+3
2017-12-22git-p4: update multiple shelved change listsLibravatar Luke Diamand1-15/+26
2017-08-23treewide: correct several "up-to-date" to "up to date"Libravatar Martin Ågren1-1/+1
2017-07-13git-p4: filter for {'code':'info'} in p4CmdListLibravatar Miguel Torroja1-3/+6
2017-07-13git-p4: parse marshal output "p4 -G" in p4 changesLibravatar Miguel Torroja1-28/+57
2017-04-16git-p4: don't use name-rev to get current branchLibravatar Luke Diamand1-6/+1
2017-04-16git-p4: add read_pipe_text() internal functionLibravatar Luke Diamand1-3/+28
2017-02-16Merge branch 'ls/p4-path-encoding'Libravatar Junio C Hamano1-10/+14
2017-02-10git-p4: fix git-p4.pathEncoding for removed filesLibravatar Lars Schneider1-10/+14
2017-02-02Merge branch 'gv/mingw-p4-mapuser'Libravatar Junio C Hamano1-1/+1
2017-01-30git-p4: fix git-p4.mapUser on WindowsLibravatar George Vanburgh1-1/+1
2017-01-18Merge branch 'ls/p4-retry-thrice'Libravatar Junio C Hamano1-1/+3
2017-01-17Merge branch 'gv/p4-multi-path-commit-fix' into maintLibravatar Junio C Hamano1-2/+2
2017-01-17Merge branch 'ld/p4-compare-dir-vs-symlink' into maintLibravatar Junio C Hamano1-6/+20
2016-12-29git-p4: do not pass '-r 0' to p4 commandsLibravatar Igor Kushnir1-1/+3
2016-12-27Merge branch 'ls/p4-lfs'Libravatar Junio C Hamano1-2/+2
2016-12-27Merge branch 'gv/p4-multi-path-commit-fix'Libravatar Junio C Hamano1-2/+2
2016-12-27Merge branch 'ld/p4-compare-dir-vs-symlink'Libravatar Junio C Hamano1-6/+20
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