summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Merge branch 'libgit2:main' into respect-force-flag-in-remote-fetchalexjg2021-06-110-0/+0
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Respect the force flag on refspecs in git_remote_fetchAlex Good2021-06-113-1/+185
* | | | | | | | | | | Merge pull request #5980 from libgit2/ethomson/dockerfileEdward Thomson2021-08-096-33/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ci: remove the docker entrypointethomson/dockerfileEdward Thomson2021-08-096-33/+30
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5978 from boretrk/amigaEdward Thomson2021-08-091-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | amiga: use ';' as path list separator on AmigaOSPeter Pettersson2021-08-081-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5962 from libgit2/ethomson/futimensEdward Thomson2021-07-313-1/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cmake: extended futimens checking on macOSethomson/futimensEdward Thomson2021-07-303-1/+16
* | | | | | | | | | | README: link to more information about cmakeEdward Thomson2021-07-301-0/+2
* | | | | | | | | | | Merge pull request #5961 from libgit2/ethomson/odb_tests_priorityEdward Thomson2021-07-303-2/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | tests: reset odb backend priorityethomson/odb_tests_priorityEdward Thomson2021-07-303-2/+11
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'pr/5491'Edward Thomson2021-07-304-7/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | odb: Implement option for overriding of default odb backend priorityTony De La Nuez2021-07-304-7/+50
* | | | | | | | | | | Merge pull request #5957 from lhchavez/fix-master-buildEdward Thomson2021-07-301-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix one memory leak in masterlhchavez2021-07-301-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'pr/5861'Edward Thomson2021-07-303-3/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tests: reformat upstream mergeEdward Thomson2021-07-301-5/+5
| * | | | | | | | | | tests: upstream merge test has been added.Dmitry Lobanov2021-06-181-0/+23
| * | | | | | | | | | branch: git branch upstream with format format name parameter has been added.Dmitry Lobanov2021-05-181-28/+3
| * | | | | | | | | | branch: git branch upstream functions layouts have been fixed.Dmitry Lobanov2021-05-161-4/+6
| * | | | | | | | | | branch: git branch upstream format enum has been added.Dmitry Lobanov2021-05-161-4/+27
| * | | | | | | | | | branch: git branch upstream functions layouts have been fixed.Dmitry Lobanov2021-05-161-2/+4
| * | | | | | | | | | branch: git branch upstream merge has been exposed.Dmitry Lobanov2021-05-122-0/+21
| * | | | | | | | | | branch: git branch upstream with format has been added.Dmitry Lobanov2021-05-121-2/+2
* | | | | | | | | | | Merge branch 'pr/5940'Edward Thomson2021-07-306-133/+265
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | status: document `GIT_STATUS_OPT_INCLUDE_UNREADABLE`Edward Thomson2021-07-302-29/+75
| * | | | | | | | | | | Fix struct documentation formattingpunkymaniac2021-07-064-86/+158
| * | | | | | | | | | | Add missing return documentationpunkymaniac2021-07-061-0/+2
| * | | | | | | | | | | Add missing empty linepunkymaniac2021-07-061-0/+1
| * | | | | | | | | | | Fix documentation formatting for git_diff_filepunkymaniac2021-07-061-19/+30
| * | | | | | | | | | | Fix bad char at the end of the wordpunkymaniac2021-07-061-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #5953 from boretrk/c99-inlineEdward Thomson2021-07-301-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | common.h: use inline when compiling for c99 and laterPeter Pettersson2021-07-261-0/+2
* | | | | | | | | | | | Merge pull request #5952 from libgit2/ethomson/attrs_from_commitEdward Thomson2021-07-2924-193/+588
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | filter: introduce GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMITEdward Thomson2021-07-2212-5/+104
| * | | | | | | | | | | | attr: introduce GIT_ATTR_CHECK_INCLUDE_COMMITEdward Thomson2021-07-225-17/+71
| * | | | | | | | | | | | attr: cache nonexistent attr files from commitsEdward Thomson2021-07-221-3/+18
| * | | | | | | | | | | | filter: add git_filter_optionsEdward Thomson2021-07-223-15/+70
| * | | | | | | | | | | | filter: filter options are now "filter sessions"Edward Thomson2021-07-223-26/+27
| * | | | | | | | | | | | attr: introduce `git_attr_options` for extended queriesEdward Thomson2021-07-225-20/+146
| * | | | | | | | | | | | attr: include the filename in the attr sourceEdward Thomson2021-07-226-78/+104
| * | | | | | | | | | | | attr: the attr source is now a structEdward Thomson2021-07-224-19/+26
| * | | | | | | | | | | | attr: rename internal attr file source enumEdward Thomson2021-07-228-77/+89
* | | | | | | | | | | | | Merge pull request #5954 from Crayon2000/patch-1Edward Thomson2021-07-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix typo in general.cCrayon2021-07-281-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5767 from lhchavez/cgraph-reachable-from-anyEdward Thomson2021-07-275-20/+340
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Swap the order of the `git_graph_reachable_from_any` paramslhchavez2021-07-273-11/+11
| * | | | | | | | | | | | graph: Create `git_graph_reachable_from_any()`lhchavez2021-07-275-20/+340
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #5766 from lhchavez/cgraph-generation-cmpEdward Thomson2021-07-274-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | commit-graph: Introduce `git_commit_list_generation_cmp`lhchavez2021-07-264-2/+21
|/ / / / / / / / / / /