aboutsummaryrefslogtreecommitdiff
path: root/git-p4.py
Commit message (Expand)AuthorAge
* Merge branch 'ls/p4-path-encoding'Junio C Hamano2017-02-16
|\
| * git-p4: fix git-p4.pathEncoding for removed filesLars Schneider2017-02-10
* | Merge branch 'gv/mingw-p4-mapuser'Junio C Hamano2017-02-02
|\ \
| * | git-p4: fix git-p4.mapUser on WindowsGeorge Vanburgh2017-01-30
| * | Merge branch 'gv/p4-multi-path-commit-fix' into maintJunio C Hamano2017-01-17
| |\ \
| * \ \ Merge branch 'ld/p4-compare-dir-vs-symlink' into maintJunio C Hamano2017-01-17
| |\ \ \
* | \ \ \ Merge branch 'ls/p4-retry-thrice'Junio C Hamano2017-01-18
|\ \ \ \ \
| * | | | | git-p4: do not pass '-r 0' to p4 commandsIgor Kushnir2016-12-29
* | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-12-27
|\ \ \ \ \ \
| * | | | | | git-p4: add diff/merge properties to .gitattributes for GitLFS filesLars Schneider2016-12-20
* | | | | | | Merge branch 'gv/p4-multi-path-commit-fix'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | git-p4: fix multi-path changelist empty commitsGeorge Vanburgh2016-12-19
| * | | | | | Merge branch 'ao/p4-has-branch-prefix-fix' into maintJunio C Hamano2016-07-11
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'ld/p4-compare-dir-vs-symlink'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | git-p4: avoid crash adding symlinked directoryLuke Diamand2016-12-18
* | | | | | | | Merge branch 'ld/p4-worktree'Junio C Hamano2016-12-19
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: support git worktreesLuke Diamand2016-12-13
| |/ / / / / / /
* | | | | | | | Merge branch 'ls/p4-retry-thrice'Junio C Hamano2016-12-16
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | git-p4: add config to retry p4 commands; retry 3 times by defaultLars Schneider2016-12-05
| |/ / / / / /
* | | | | | | Merge branch 'ls/p4-empty-file-on-lfs'Junio C Hamano2016-12-16
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | git-p4: fix empty file processing for large file system backend GitLFSLars Schneider2016-12-05
| |/ / / / /
* | | | | | git-p4: support updating an existing shelved changelistLuke Diamand2016-12-05
* | | | | | git-p4: allow submit to create shelved changelists.Vinicius Kursancew2016-11-29
|/ / / / /
* | | | | Spelling fixesVille Skyttä2016-08-11
* | | | | Merge branch 'ls/p4-tmp-refs'Junio C Hamano2016-07-19
|\ \ \ \ \
| * | | | | git-p4: place temporary refs used for branch import under refs/git-p4-tmpLars Schneider2016-07-08
| |/ / / /
* | | | | Merge branch 'ao/p4-has-branch-prefix-fix'Junio C Hamano2016-07-06
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | git-p4: correct hasBranchPrefix verbose outputAndrew Oakley2016-06-22
* | | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-05-10
|\ \ \ \ | | |/ / | |/| |
| * | | git-p4: fix Git LFS pointer parsingLars Schneider2016-04-28
* | | | git-p4: add P4 jobs to git commit messageJan Durovec2016-04-19
* | | | Merge branch 'ls/p4-map-user'Junio C Hamano2016-04-06
|\ \ \ \ | |/ / / |/| | |
| * | | git-p4: map a P4 user to Git author name and email addressLars Schneider2016-03-15
| | |/ | |/|
* | | git-p4.py: add support for filetype changeRomain Picard2016-01-13
|/ /
* | Merge branch 'sh/p4-multi-depot'Junio C Hamano2015-12-28
|\ \
| * | git-p4: reduce number of server queries for fetchesSam Hocevar2015-12-21
| * | git-p4: support multiple depot paths in p4 submitSam Hocevar2015-12-21
* | | Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano2015-12-15
|\ \ \ | |/ / |/| / | |/
| * git-p4: add option to keep empty commitsLars Schneider2015-12-10
* | Merge branch 'maint'Jeff King2015-12-01
|\ \
| * \ Merge branch 'eg/p4-submit-catch-failure' into maintJeff King2015-12-01
| |\ \
| | * | git-p4: clean up after p4 submit failureGIRARD Etienne2015-11-24
| * | | Merge branch 'ld/p4-detached-head' into maintJeff King2015-12-01
| |\ \ \
| | * | | git-p4: work with a detached headLuke Diamand2015-11-24
| | * | | git-p4: add option to system() to return subshell statusLuke Diamand2015-11-24
| | |/ /
| * | | Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-03
| |\ \ \
| * \ \ \ Merge branch 'ld/p4-import-labels' into maintJunio C Hamano2015-11-03
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge branch 'dk/p4-import-ctypes'Junio C Hamano2015-10-26
|\ \ \ \ \
| * | | | | git-p4: import the ctypes moduleDennis Kaarsemaker2015-10-20
* | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2015-10-15
|\ \ \ \ \ \