summaryrefslogtreecommitdiff
path: root/git-p4.py
Commit message (Expand)AuthorAgeFilesLines
* git-p4: auto-delete named temporary filePhilip.McGraw2019-10-061-7/+6
* Merge branch 'am/p4-branches-excludes'Junio C Hamano2019-07-091-17/+27
|\
| * git-p4: respect excluded paths when detecting branchesMazo, Andrey2019-04-021-2/+1
| * git-p4: don't exclude other files with same prefixMazo, Andrey2019-04-021-7/+14
| * git-p4: don't groom exclude path list on every commitMazo, Andrey2019-04-021-5/+7
| * git-p4: match branches case insensitively if configuredMazo, Andrey2019-04-021-2/+2
| * git-p4: detect/prevent infinite loop in gitCommitByP4Change()Mazo, Andrey2019-04-021-1/+3
* | Merge branch 'mm/p4-unshelve-windows-fix'Junio C Hamano2019-06-171-1/+1
|\ \
| * | p4 unshelve: fix "Not a valid object name HEAD0" on WindowsMike Mueller2019-05-281-1/+1
| |/
* | git-p4: allow unshelving of branched filesSimon Williams2019-05-281-1/+1
|/
* Merge branch 'ld/git-p4-shelve-update-fix'Junio C Hamano2019-02-051-0/+2
|\
| * git-p4: handle update of moved/copied files when updating a shelveLuke Diamand2019-01-181-0/+2
* | git-p4: fix problem when p4 login is not necessaryPeter Osterlund2019-01-071-0/+2
|/
* git-p4: fully support unshelving changelistsLuke Diamand2018-10-161-36/+48
* git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelvedLuke Diamand2018-10-161-1/+2
* git-p4: do not fail in verbose mode for missing 'fileSize' keyLuke Diamand2018-10-121-1/+4
* git-p4: add the `p4-pre-submit` hookChen Bin2018-08-011-1/+15
* git-p4: python3: fix octal constantsLuke Diamand2018-06-191-1/+1
* git-p4: python3: use print() functionLuke Diamand2018-06-191-124/+124
* git-p4: python3: basestring workaroundLuke Diamand2018-06-191-0/+16
* git-p4: python3: remove backticksLuke Diamand2018-06-191-1/+1
* git-p4: python3: replace dict.has_key(k) with "k in dict"Luke Diamand2018-06-191-39/+39
* git-p4: python3: replace <> with !=Luke Diamand2018-06-191-1/+1
* Merge branch 'ld/git-p4-updates'Junio C Hamano2018-06-181-24/+156
|\
| * git-p4: auto-size the blockLuke Diamand2018-06-121-6/+21
| * git-p4: narrow the scope of exceptions caught when parsing an intLuke Diamand2018-06-121-1/+1
| * git-p4: raise exceptions from p4CmdList based on error from p4 serverLuke Diamand2018-06-121-4/+40
| * git-p4: better error reporting when p4 failsLuke Diamand2018-06-121-0/+55
| * git-p4: add option to disable syncing of p4/master with p4Luke Diamand2018-06-121-11/+20
| * git-p4: disable-rebase: allow setting this via configurationLuke Diamand2018-06-121-1/+1
| * git-p4: add options --commit and --disable-rebaseRomain Merland2018-06-121-6/+23
* | Merge branch 'ld/p4-unshelve'Junio C Hamano2018-06-011-36/+177
|\ \
| * | git-p4: add unshelve commandLuke Diamand2018-05-241-36/+177
| |/
* | git-p4: change "commitish" typo to "committish"Ævar Arnfjörð Bjarmason2018-05-111-3/+3
|/
* git-p4: update multiple shelved change listsld/p4-multiple-shelvesLuke Diamand2017-12-221-15/+26
* treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-1/+1
* git-p4: filter for {'code':'info'} in p4CmdListmt/p4-parse-G-outputMiguel Torroja2017-07-131-3/+6
* git-p4: parse marshal output "p4 -G" in p4 changesMiguel Torroja2017-07-131-28/+57
* git-p4: don't use name-rev to get current branchld/p4-current-branch-fixLuke Diamand2017-04-161-6/+1
* git-p4: add read_pipe_text() internal functionLuke Diamand2017-04-161-3/+28
* Merge branch 'ls/p4-path-encoding'Junio C Hamano2017-02-161-10/+14
|\
| * git-p4: fix git-p4.pathEncoding for removed filesls/p4-path-encodingLars Schneider2017-02-101-10/+14
* | Merge branch 'gv/mingw-p4-mapuser'Junio C Hamano2017-02-021-1/+1
|\ \
| * | git-p4: fix git-p4.mapUser on Windowsgv/mingw-p4-mapuserGeorge Vanburgh2017-01-301-1/+1
| * | Merge branch 'gv/p4-multi-path-commit-fix' into maintJunio C Hamano2017-01-171-2/+2
| |\ \
| * \ \ Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano2017-01-171-6/+20
| |\ \ \
* | \ \ \ Merge branch 'ls/p4-retry-thrice'Junio C Hamano2017-01-181-1/+3
|\ \ \ \ \
| * | | | | git-p4: do not pass '-r 0' to p4 commandsls/p4-retry-thriceIgor Kushnir2016-12-291-1/+3
* | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-12-271-2/+2
|\ \ \ \ \ \
| * | | | | | git-p4: add diff/merge properties to .gitattributes for GitLFS filesls/p4-lfsLars Schneider2016-12-201-2/+2
View Lorry Controller Status