summaryrefslogtreecommitdiffstats
path: root/git-p4.py
AgeCommit message (Expand)AuthorLines
2018-06-18Merge branch 'ld/git-p4-updates'Junio C Hamano-24/+156
2018-06-12git-p4: auto-size the blockLuke Diamand-6/+21
2018-06-12git-p4: narrow the scope of exceptions caught when parsing an intLuke Diamand-1/+1
2018-06-12git-p4: raise exceptions from p4CmdList based on error from p4 serverLuke Diamand-4/+40
2018-06-12git-p4: better error reporting when p4 failsLuke Diamand-0/+55
2018-06-12git-p4: add option to disable syncing of p4/master with p4Luke Diamand-11/+20
2018-06-12git-p4: disable-rebase: allow setting this via configurationLuke Diamand-1/+1
2018-06-12git-p4: add options --commit and --disable-rebaseRomain Merland-6/+23
2018-06-01Merge branch 'ld/p4-unshelve'Junio C Hamano-36/+177
2018-05-24git-p4: add unshelve commandLuke Diamand-36/+177
2018-05-11git-p4: change "commitish" typo to "committish"Ævar Arnfjörð Bjarmason-3/+3
2017-12-22git-p4: update multiple shelved change listsLuke Diamand-15/+26
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren-1/+1
2017-07-13git-p4: filter for {'code':'info'} in p4CmdListMiguel Torroja-3/+6
2017-07-13git-p4: parse marshal output "p4 -G" in p4 changesMiguel Torroja-28/+57
2017-04-16git-p4: don't use name-rev to get current branchLuke Diamand-6/+1
2017-04-16git-p4: add read_pipe_text() internal functionLuke Diamand-3/+28
2017-02-16Merge branch 'ls/p4-path-encoding'Junio C Hamano-10/+14
2017-02-10git-p4: fix git-p4.pathEncoding for removed filesLars Schneider-10/+14
2017-02-02Merge branch 'gv/mingw-p4-mapuser'Junio C Hamano-1/+1
2017-01-30git-p4: fix git-p4.mapUser on WindowsGeorge Vanburgh-1/+1
2017-01-18Merge branch 'ls/p4-retry-thrice'Junio C Hamano-1/+3
2017-01-17Merge branch 'gv/p4-multi-path-commit-fix' into maintJunio C Hamano-2/+2
2017-01-17Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano-6/+20
2016-12-29git-p4: do not pass '-r 0' to p4 commandsIgor Kushnir-1/+3
2016-12-27Merge branch 'ls/p4-lfs'Junio C Hamano-2/+2
2016-12-27Merge branch 'gv/p4-multi-path-commit-fix'Junio C Hamano-2/+2
2016-12-27Merge branch 'ld/p4-compare-dir-vs-symlink'Junio C Hamano-6/+20
2016-12-20git-p4: add diff/merge properties to .gitattributes for GitLFS filesLars Schneider-2/+2
2016-12-19Merge branch 'ld/p4-worktree'Junio C Hamano-4/+13
2016-12-19git-p4: fix multi-path changelist empty commitsGeorge Vanburgh-2/+2
2016-12-18git-p4: avoid crash adding symlinked directoryLuke Diamand-6/+20
2016-12-16Merge branch 'ls/p4-retry-thrice'Junio C Hamano-0/+5
2016-12-16Merge branch 'ls/p4-empty-file-on-lfs'Junio C Hamano-12/+17
2016-12-13git-p4: support git worktreesLuke Diamand-4/+13
2016-12-05git-p4: fix empty file processing for large file system backend GitLFSLars Schneider-12/+17
2016-12-05git-p4: add config to retry p4 commands; retry 3 times by defaultLars Schneider-0/+5
2016-12-05git-p4: support updating an existing shelved changelistLuke Diamand-4/+29
2016-11-29git-p4: allow submit to create shelved changelists.Vinicius Kursancew-14/+22
2016-08-11Spelling fixesVille Skyttä-1/+1
2016-07-19Merge branch 'ls/p4-tmp-refs'Junio C Hamano-1/+1
2016-07-11Merge branch 'ao/p4-has-branch-prefix-fix' into maintJunio C Hamano-1/+1
2016-07-08git-p4: place temporary refs used for branch import under refs/git-p4-tmpLars Schneider-1/+1
2016-07-06Merge branch 'ao/p4-has-branch-prefix-fix'Junio C Hamano-1/+1
2016-06-22git-p4: correct hasBranchPrefix verbose outputAndrew Oakley-1/+1
2016-05-10Merge branch 'ls/p4-lfs'Junio C Hamano-3/+10
2016-04-28git-p4: fix Git LFS pointer parsingLars Schneider-3/+10
2016-04-19git-p4: add P4 jobs to git commit messageJan Durovec-0/+12
2016-04-06Merge branch 'ls/p4-map-user'Junio C Hamano-0/+9
2016-03-15git-p4: map a P4 user to Git author name and email addressLars Schneider-0/+9