| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'ld/git-p4-updates' | Junio C Hamano | 2018-06-18 | 1 | -24/+156 |
| |\ | |||||
| | * | git-p4: auto-size the block | Luke Diamand | 2018-06-12 | 1 | -6/+21 |
| | * | git-p4: narrow the scope of exceptions caught when parsing an int | Luke Diamand | 2018-06-12 | 1 | -1/+1 |
| | * | git-p4: raise exceptions from p4CmdList based on error from p4 server | Luke Diamand | 2018-06-12 | 1 | -4/+40 |
| | * | git-p4: better error reporting when p4 fails | Luke Diamand | 2018-06-12 | 1 | -0/+55 |
| | * | git-p4: add option to disable syncing of p4/master with p4 | Luke Diamand | 2018-06-12 | 1 | -11/+20 |
| | * | git-p4: disable-rebase: allow setting this via configuration | Luke Diamand | 2018-06-12 | 1 | -1/+1 |
| | * | git-p4: add options --commit and --disable-rebase | Romain Merland | 2018-06-12 | 1 | -6/+23 |
| * | | Merge branch 'ld/p4-unshelve' | Junio C Hamano | 2018-06-01 | 1 | -36/+177 |
| |\ \ | |||||
| | * | | git-p4: add unshelve command | Luke Diamand | 2018-05-24 | 1 | -36/+177 |
| | |/ | |||||
| * / | git-p4: change "commitish" typo to "committish" | Ævar Arnfjörð Bjarmason | 2018-05-11 | 1 | -3/+3 |
| |/ | |||||
| * | git-p4: update multiple shelved change lists | Luke Diamand | 2017-12-22 | 1 | -15/+26 |
| * | treewide: correct several "up-to-date" to "up to date" | Martin Ågren | 2017-08-23 | 1 | -1/+1 |
| * | git-p4: filter for {'code':'info'} in p4CmdList | Miguel Torroja | 2017-07-13 | 1 | -3/+6 |
| * | git-p4: parse marshal output "p4 -G" in p4 changes | Miguel Torroja | 2017-07-13 | 1 | -28/+57 |
| * | git-p4: don't use name-rev to get current branch | Luke Diamand | 2017-04-17 | 1 | -6/+1 |
| * | git-p4: add read_pipe_text() internal function | Luke Diamand | 2017-04-17 | 1 | -3/+28 |
| * | Merge branch 'ls/p4-path-encoding' | Junio C Hamano | 2017-02-16 | 1 | -10/+14 |
| |\ | |||||
| | * | git-p4: fix git-p4.pathEncoding for removed files | Lars Schneider | 2017-02-10 | 1 | -10/+14 |
| * | | Merge branch 'gv/mingw-p4-mapuser' | Junio C Hamano | 2017-02-02 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | git-p4: fix git-p4.mapUser on Windows | George Vanburgh | 2017-01-30 | 1 | -1/+1 |
| | * | | Merge branch 'gv/p4-multi-path-commit-fix' into maint | Junio C Hamano | 2017-01-18 | 1 | -2/+2 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'ld/p4-compare-dir-vs-symlink' into maint | Junio C Hamano | 2017-01-18 | 1 | -6/+20 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge branch 'ls/p4-retry-thrice' | Junio C Hamano | 2017-01-19 | 1 | -1/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | git-p4: do not pass '-r 0' to p4 commands | Igor Kushnir | 2016-12-29 | 1 | -1/+3 |
| * | | | | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2016-12-27 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | git-p4: add diff/merge properties to .gitattributes for GitLFS files | Lars Schneider | 2016-12-20 | 1 | -2/+2 |
| * | | | | | | | Merge branch 'gv/p4-multi-path-commit-fix' | Junio C Hamano | 2016-12-27 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | | git-p4: fix multi-path changelist empty commits | George Vanburgh | 2016-12-19 | 1 | -2/+2 |
| | * | | | | | | Merge branch 'ao/p4-has-branch-prefix-fix' into maint | Junio C Hamano | 2016-07-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ | Merge branch 'ld/p4-compare-dir-vs-symlink' | Junio C Hamano | 2016-12-27 | 1 | -6/+20 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | | git-p4: avoid crash adding symlinked directory | Luke Diamand | 2016-12-18 | 1 | -6/+20 |
| * | | | | | | | | Merge branch 'ld/p4-worktree' | Junio C Hamano | 2016-12-19 | 1 | -4/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | git-p4: support git worktrees | Luke Diamand | 2016-12-14 | 1 | -4/+13 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'ls/p4-retry-thrice' | Junio C Hamano | 2016-12-17 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | | git-p4: add config to retry p4 commands; retry 3 times by default | Lars Schneider | 2016-12-05 | 1 | -0/+5 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'ls/p4-empty-file-on-lfs' | Junio C Hamano | 2016-12-17 | 1 | -12/+17 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | | git-p4: fix empty file processing for large file system backend GitLFS | Lars Schneider | 2016-12-05 | 1 | -12/+17 |
| | |/ / / / / | |||||
| * | | | | | | git-p4: support updating an existing shelved changelist | Luke Diamand | 2016-12-05 | 1 | -4/+29 |
| * | | | | | | git-p4: allow submit to create shelved changelists. | Vinicius Kursancew | 2016-11-29 | 1 | -14/+22 |
| |/ / / / / | |||||
| * | | | | | Spelling fixes | Ville Skyttä | 2016-08-11 | 1 | -1/+1 |
| * | | | | | Merge branch 'ls/p4-tmp-refs' | Junio C Hamano | 2016-07-19 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | git-p4: place temporary refs used for branch import under refs/git-p4-tmp | Lars Schneider | 2016-07-09 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'ao/p4-has-branch-prefix-fix' | Junio C Hamano | 2016-07-06 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| | * | | | git-p4: correct hasBranchPrefix verbose output | Andrew Oakley | 2016-06-22 | 1 | -1/+1 |
| * | | | | Merge branch 'ls/p4-lfs' | Junio C Hamano | 2016-05-10 | 1 | -3/+10 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | git-p4: fix Git LFS pointer parsing | Lars Schneider | 2016-04-28 | 1 | -3/+10 |
| * | | | | git-p4: add P4 jobs to git commit message | Jan Durovec | 2016-04-19 | 1 | -0/+12 |
| * | | | | Merge branch 'ls/p4-map-user' | Junio C Hamano | 2016-04-06 | 1 | -0/+9 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | git-p4: map a P4 user to Git author name and email address | Lars Schneider | 2016-03-15 | 1 | -0/+9 |
| | | |/ | |/| | |||||
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |