summaryrefslogtreecommitdiff
path: root/git-p4.py
AgeCommit message (Expand)AuthorFilesLines
2019-02-05Merge branch 'ld/git-p4-shelve-update-fix'Libravatar Junio C Hamano1-0/+2
2019-01-18git-p4: handle update of moved/copied files when updating a shelveLibravatar Luke Diamand1-0/+2
2019-01-07git-p4: fix problem when p4 login is not necessaryLibravatar Peter Osterlund1-0/+2
2018-10-16git-p4: fully support unshelving changelistsLibravatar Luke Diamand1-36/+48
2018-10-16git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelvedLibravatar Luke Diamand1-1/+2
2018-10-12git-p4: do not fail in verbose mode for missing 'fileSize' keyLibravatar Luke Diamand1-1/+4
2018-08-01git-p4: add the `p4-pre-submit` hookLibravatar Chen Bin1-1/+15
2018-06-19git-p4: python3: fix octal constantsLibravatar Luke Diamand1-1/+1
2018-06-19git-p4: python3: use print() functionLibravatar Luke Diamand1-124/+124
2018-06-19git-p4: python3: basestring workaroundLibravatar Luke Diamand1-0/+16
2018-06-19git-p4: python3: remove backticksLibravatar Luke Diamand1-1/+1
2018-06-19git-p4: python3: replace dict.has_key(k) with "k in dict"Libravatar Luke Diamand1-39/+39
2018-06-19git-p4: python3: replace <> with !=Libravatar Luke Diamand1-1/+1
2018-06-18Merge branch 'ld/git-p4-updates'Libravatar Junio C Hamano1-24/+156
2018-06-12git-p4: auto-size the blockLibravatar Luke Diamand1-6/+21
2018-06-12git-p4: narrow the scope of exceptions caught when parsing an intLibravatar Luke Diamand1-1/+1
2018-06-12git-p4: raise exceptions from p4CmdList based on error from p4 serverLibravatar Luke Diamand1-4/+40
2018-06-12git-p4: better error reporting when p4 failsLibravatar Luke Diamand1-0/+55
2018-06-12git-p4: add option to disable syncing of p4/master with p4Libravatar Luke Diamand1-11/+20
2018-06-12git-p4: disable-rebase: allow setting this via configurationLibravatar Luke Diamand1-1/+1
2018-06-12git-p4: add options --commit and --disable-rebaseLibravatar Romain Merland1-6/+23
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