summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* CHANGELOG: update `GIT_MERGE_OPTIONS_INIT` changesethomson/merge_optsEdward Thomson2017-01-141-0/+4
* merge: set default rename thresholdEdward Thomson2017-01-013-5/+8
* Merge pull request #4015 from staticfloat/sf/win_http_parserEdward Thomson2016-12-311-13/+12
|\
| * CMakeLists: Move `http-parser` block down by `zlib`, update error messageElliot Saba2016-12-301-13/+12
| * Allow Windows with WinHTTP to use external http-parserElliot Saba2016-11-201-13/+13
* | Merge pull request #4052 from dglsswnsn/masterEdward Thomson2016-12-301-4/+6
|\ \
| * | Fix issue #4046 Seg fault in config_files()Douglas Swanson2016-12-291-4/+6
* | | Merge pull request #4043 from fudanchii/fudanchii/openbsdEdward Thomson2016-12-301-1/+1
|\ \ \ | |/ / |/| |
| * | Fix BIO_* functions method linking when compiled with libressl.Nurahmadie2016-12-241-1/+1
* | | Merge pull request #4048 from jacquesg/rebase-error-checkEdward Thomson2016-12-291-1/+1
|\ \ \
| * | | rebase: check the result code of rebase_init_mergeJacques Germishuys2016-12-291-1/+1
|/ / /
* | | Merge pull request #4044 from jacquesg/mempack-versionEdward Thomson2016-12-271-0/+1
|\ \ \ | |/ / |/| |
| * | mempack: set the odb backend versionJacques Germishuys2016-12-251-0/+1
|/ /
* | Merge pull request #3980 from tiennou/doc-fixesv0.25.0-rc2v0.25.0Carlos Martín Nieto2016-12-203-5/+17
|\ \
| * | transaction: fix documentationEtienne Samson2016-11-011-0/+9
| * | remote: fix documentation and indentEtienne Samson2016-11-011-1/+3
| * | remote: unused function typedefEtienne Samson2016-11-011-2/+0
| * | describe: fix documentationEtienne Samson2016-11-011-2/+5
* | | Merge pull request #4041 from libgit2/cmn/bump-pretend-gitEdward Thomson2016-12-201-1/+1
|\ \ \
| * | | http: bump the pretend git version in the User-Agentcmn/bump-pretend-gitCarlos Martín Nieto2016-12-201-1/+1
|/ / /
* | | Merge pull request #4034 from libgit2/cmn/sysdir-no-reguessEdward Thomson2016-12-202-1/+22
|\ \ \
| * | | sysdir: don't guess the paths again when $PATH is specifiedcmn/sysdir-no-reguessCarlos Martín Nieto2016-12-181-1/+1
| * | | sysdir: add failing test for variable substitutionCarlos Martín Nieto2016-12-181-0/+21
* | | | Merge pull request #4032 from libgit2/cmn/https-cap-no-hardcodeEdward Thomson2016-12-202-0/+20
|\ \ \ \
| * | | | settings: clarify what each value meanscmn/https-cap-no-hardcodeCarlos Martín Nieto2016-12-171-0/+18
| * | | | settings: don't hard-code HTTPS capabilityCarlos Martín Nieto2016-12-171-0/+2
| |/ / /
* | | | Merge pull request #4037 from libgit2/cmn/goalsCarlos Martín Nieto2016-12-201-3/+11
|\ \ \ \
| * | | | README: be more explicit in the goals and scopecmn/goalsCarlos Martín Nieto2016-12-191-3/+11
* | | | | Merge pull request #4038 from lucasderraugh/patch-1Carlos Martín Nieto2016-12-191-1/+1
|\ \ \ \ \
| * | | | | Gift deprecated in favor of SwiftGit2Lucas Derraugh2016-12-191-1/+1
* | | | | | Merge pull request #4026 from libgit2/cmn/refdb-fs-errorsCarlos Martín Nieto2016-12-191-2/+2
|\ \ \ \ \ \
| * | | | | | refdb: bubble up recursive rm when locking a refcmn/refdb-fs-errorsCarlos Martín Nieto2016-12-161-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4027 from pks-t/pks/pack-deref-cache-on-errorCarlos Martín Nieto2016-12-191-1/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | pack: dereference cached pack entry on errorPatrick Steinhardt2016-12-121-1/+4
* | | | | | Merge pull request #4033 from andhe/masterCarlos Martín Nieto2016-12-191-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix off-by-one problems in git_signature__parseAndreas Henriksson2016-12-171-1/+1
|/ / / / /
* | | | | Merge pull request #4031 from libgit2/cmn/plug-test-leakCarlos Martín Nieto2016-12-171-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | rebase: plug a leak in the testscmn/plug-test-leakCarlos Martín Nieto2016-12-171-0/+1
|/ / / /
* | | | Merge pull request #4029 from libgit2/cmn/windows-no-concurrent-compressv0.24.4Edward Thomson2016-12-151-2/+8
|\ \ \ \
| * | | | refdb: disable concurrent compress in the threading tests on Windowscmn/windows-no-concurrent-compressCarlos Martín Nieto2016-12-121-2/+8
| |/ / /
* | | | Merge pull request #4018 from pks-t/pks/various-fixesCarlos Martín Nieto2016-12-128-12/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Fix potential use of uninitialized valuesPatrick Steinhardt2016-12-123-3/+5
| * | | graph: flag fields should be declared as unsignedPatrick Steinhardt2016-12-121-1/+1
| * | | transports: smart: do not redeclare loop countersPatrick Steinhardt2016-12-121-4/+4
| * | | path: remove unused local variablePatrick Steinhardt2016-12-121-1/+0
| * | | revwalk: do not re-declare `commit` variablePatrick Steinhardt2016-12-121-1/+1
| * | | odb_mempack: mark zero-length array as GIT_FLEX_ARRAYPatrick Steinhardt2016-12-121-1/+1
| * | | clar: mark `cl_git_thread_check()` as inlinePatrick Steinhardt2016-12-121-1/+1
|/ / /
* | | Merge pull request #4020 from novalis/rebase-detachedEdward Thomson2016-12-072-1/+54
|\ \ \
| * | | git_rebase_init: correctly handle detached HEADDavid Turner2016-12-012-1/+54
| | |/ | |/|