summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3621 from pra85/patch-1Carlos Martín Nieto2016-02-181-1/+1
|\
| * Fix a typoPrayag Verma2016-02-181-1/+1
* | PROJECTS: remove a few things we do haveCarlos Martín Nieto2016-02-181-4/+0
|/
* Merge pull request #3617 from libgit2/cmn/extract-sig-errorsCarlos Martín Nieto2016-02-163-1/+24
|\
| * commit: expose the different kinds of errorsCarlos Martín Nieto2016-02-163-1/+24
|/
* Merge pull request #3615 from ethomson/rebase_bareCarlos Martín Nieto2016-02-164-24/+62
|\
| * rebase: persist a single in-memory indexEdward Thomson2016-02-154-24/+62
|/
* Merge pull request #3610 from ethomson/rebase_bareCarlos Martín Nieto2016-02-125-125/+441
|\
| * rebase: allow custom merge_optionsEdward Thomson2016-02-113-3/+39
| * rebase: introduce inmemory rebasingEdward Thomson2016-02-114-124/+404
* | Merge pull request #3612 from arthurschreiber/arthur/fix-3173Edward Thomson2016-02-1111-53/+55
|\ \
| * | Horrible fix for #3173.Arthur Schreiber2016-02-1111-53/+55
|/ /
* | commit: don't forget the last header fieldCarlos Martín Nieto2016-02-112-1/+8
* | Merge pull request #3607 from pks-t/pks/coverity-improvementsCarlos Martín Nieto2016-02-112-2/+11
|\ \ | |/ |/|
| * coverity: use https URL for posting buildPatrick Steinhardt2016-02-101-2/+1
| * coverity: provide nodef for GITERR_CHECK_ALLOCPatrick Steinhardt2016-02-102-0/+10
|/
* Merge pull request #3599 from libgit2/gpgsignVicent Marti2016-02-093-0/+147
|\
| * Introduce git_commit_extract_signaturegpgsignCarlos Martín Nieto2016-02-093-0/+147
* | Merge pull request #3603 from pks-t/pks/coverity-fixesCarlos Martín Nieto2016-02-094-8/+14
|\ \
| * | attr_file: fix resource leakPatrick Steinhardt2016-02-091-2/+3
| * | checkout: fix resource leakPatrick Steinhardt2016-02-091-1/+3
| * | pack-objects: fix memory leak in packbuilder_configPatrick Steinhardt2016-02-091-4/+7
| * | pack-objects: fix memory leak in compute_write_orderPatrick Steinhardt2016-02-091-0/+1
| * | pack: do not free passed in poiter on errorPatrick Steinhardt2016-02-091-1/+0
* | | Merge pull request #3602 from libgit2/cmn/header-field-2Carlos Martín Nieto2016-02-092-17/+26
|\ \ \ | |/ / |/| |
| * | commit: also match the first header field when searchingcmn/header-field-2Carlos Martín Nieto2016-02-092-17/+26
* | | Merge pull request #3598 from pks-t/pks/coverity-fixesCarlos Martín Nieto2016-02-092-3/+3
|\ \ \
| * | | curl_stream: fix unused cert infosPatrick Steinhardt2016-02-081-0/+1
| * | | merge: fix memory leakPatrick Steinhardt2016-02-081-3/+2
* | | | Merge pull request #3601 from ethomson/merge_docCarlos Martín Nieto2016-02-091-8/+0
|\ \ \ \
| * | | | Better document `git_merge_commits` reduxEdward Thomson2016-02-081-8/+0
|/ / / /
* | | | Merge pull request #3600 from ethomson/mailmapEdward Thomson2016-02-081-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | mailmap: add ethomson@github.comEdward Thomson2016-02-081-1/+2
|/ / /
* | | Merge pull request #3592 from ethomson/code_of_conductCarlos Martín Nieto2016-02-061-0/+75
|\ \ \
| * | | Introduce Contributor CovenantEdward Thomson2016-02-021-0/+75
| | |/ | |/|
* | | Merge pull request #3578 from bubaflub/fix_small_memory_leakCarlos Martín Nieto2016-02-051-1/+4
|\ \ \
| * | | Free allocated pointer to curl stream on errorBob Kuo2016-01-161-1/+4
| |/ /
* | | Merge pull request #3579 from ethomson/mingw_winhttpEdward Thomson2016-02-051-2/+7
|\ \ \
| * | | winhttp: name mangle class / iid on mingwEdward Thomson2016-01-191-2/+7
| |/ /
* | | Merge pull request #3584 from jbreeden/export_fnEdward Thomson2016-02-041-1/+1
|\ \ \
| * | | Export git_stash_apply_init_optionsjbreeden2016-01-231-1/+1
| |/ /
* | | Merge pull request #3594 from Ephemera/patch-1Edward Thomson2016-02-041-1/+1
|\ \ \
| * | | Fix typoEphemera2016-02-051-1/+1
|/ / /
* | | Merge pull request #3593 from nvanheuverzwijn/patch-1Edward Thomson2016-02-041-1/+1
|\ \ \ | |/ / |/| |
| * | Fix a typo in documentationNicolas Vanheuverzwijn2016-02-031-1/+1
|/ /
* | Merge pull request #3573 from pmq20/master-12jan16Carlos Martín Nieto2016-01-162-9/+2
|\ \
| * | Make packfile_unpack_compressed a private APIP.S.V.R2016-01-132-9/+2
| |/
* | Merge pull request #3569 from arthurschreiber/arthur/fix-windows-issuesCarlos Martín Nieto2016-01-132-2/+3
|\ \ | |/ |/|
| * Wrap path in quotes to support paths containing whitespace.Arthur Schreiber2016-01-091-1/+1
| * Add winhttp dependencies to pc file.Arthur Schreiber2016-01-091-1/+2
|/