summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* error: store the error messages in a reusable buffercmn/error-bufferCarlos Martín Nieto2015-07-283-23/+42
* Merge pull request #3307 from libgit2/cmn/submodule-backslashEdward Thomson2015-07-244-0/+55
|\
| * submodule, path: extract slash conversioncmn/submodule-backslashCarlos Martín Nieto2015-07-133-7/+24
| * submodule: normalize slashes in resolve_urlCarlos Martín Nieto2015-07-131-0/+15
| * submodule: add failing test for backslash in urlCarlos Martín Nieto2015-07-131-0/+23
* | Merge pull request #3303 from libgit2/cmn/index-add-submoduleEdward Thomson2015-07-245-2/+65
|\ \
| * | index: allow add_bypath to update submodulescmn/index-add-submoduleCarlos Martín Nieto2015-07-122-2/+34
| * | blob: fail to create a blob from a dir with EDIRECTORYCarlos Martín Nieto2015-07-123-0/+30
| * | errors: add EDIRECTORYCarlos Martín Nieto2015-07-121-0/+1
* | | Merge pull request #3305 from libgit2/cmn/reflog-del-backendEdward Thomson2015-07-245-14/+17
|\ \ \
| * | | refdb: delete a ref's reflog upon deletioncmn/reflog-del-backendCarlos Martín Nieto2015-07-125-14/+17
| |/ /
* | | Merge pull request #3304 from libgit2/cmn/checkout-free-streamEdward Thomson2015-07-241-7/+9
|\ \ \
| * | | filter: make sure to close the stream even on errorcmn/checkout-free-streamCarlos Martín Nieto2015-07-121-7/+9
| |/ /
* | | Merge pull request #3317 from csware/fix-vistaEdward Thomson2015-07-231-3/+8
|\ \ \
| * | | Make libgit2 work on Windows Vista againSven Strickroth2015-07-221-3/+8
* | | | Merge pull request #3322 from libgit2/fix-init-orderingJosh Abernathy2015-07-221-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into fix-init-orderingfix-init-orderingjoshaber2015-07-2266-379/+1753
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3315 from rcorre/docfixCarlos Martín Nieto2015-07-201-1/+9
|\ \ \ \
| * | | | Document git_fetch_options struct and fix typo.Ryan Roden-Corrent2015-07-201-1/+9
|/ / / /
* | | | Merge pull request #3311 from Fallso/MacroRedefinitionEdward Thomson2015-07-151-0/+2
|\ \ \ \
| * | | | Fix macro redefinition warningFallso2015-07-151-0/+2
* | | | | Merge pull request #3302 from libgit2/cmn/submodule-foreach-diff-pathCarlos Martín Nieto2015-07-132-1/+19
|\ \ \ \ \
| * | | | | submodule: lookup the submodule by path if availablecmn/submodule-foreach-diff-pathCarlos Martín Nieto2015-07-111-1/+1
| * | | | | submdule: reproduce double-reporting of a submodule in foreachCarlos Martín Nieto2015-07-111-0/+18
* | | | | | Merge pull request #3306 from libgit2/cmn/fetch-ex-fetchCarlos Martín Nieto2015-07-131-74/+27
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | examples: modernise the fetch examplecmn/fetch-ex-fetchCarlos Martín Nieto2015-07-121-74/+27
| | |_|_|/ | |/| | |
* | | | | Merge branch 'portable-zu'Carlos Martín Nieto2015-07-1211-20/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough2015-07-1211-20/+20
* | | | | Merge pull request #3292 from tkelman/patch-1Edward Thomson2015-07-112-2/+2
|\ \ \ \ \
| * | | | | Increase required version of cmake to 2.8Tony Kelman2015-07-102-2/+2
* | | | | | Merge pull request #3301 from ethomson/warningsCarlos Martín Nieto2015-07-105-13/+18
|\ \ \ \ \ \
| * | | | | | khash: add eol so picky compilers stop warningEdward Thomson2015-07-101-1/+1
| * | | | | | wildcard filters: move CHANGELOG message to 0.23+1Edward Thomson2015-07-102-6/+5
| * | | | | | wildcard filters: clean up some warnings in testsEdward Thomson2015-07-101-5/+9
| * | | | | | xdiff: cleanup some warningsEdward Thomson2015-07-102-1/+3
* | | | | | | Merge pull request #3297 from tkelman/patch-2Carlos Martín Nieto2015-07-101-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix undefined reference with old versions of opensslTony Kelman2015-07-071-0/+2
* | | | | | | | Merge pull request #3272 from ethomson/certCarlos Martín Nieto2015-07-107-34/+32
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | git_cert: child types use proper base typeEdward Thomson2015-07-107-34/+32
|/ / / / / / /
* | | | | | | Merge pull request #3281 from ethomson/wildcard_filtersCarlos Martín Nieto2015-07-097-107/+323
|\ \ \ \ \ \ \
| * | | | | | | filters: custom filters with wildcard attributesEdward Thomson2015-07-017-107/+323
* | | | | | | | Merge pull request #3299 from ethomson/xdiff_updateCarlos Martín Nieto2015-07-0814-86/+188
|\ \ \ \ \ \ \ \
| * | | | | | | | xdiff: upgrade to core git 2.4.5Edward Thomson2015-07-0712-76/+137
| * | | | | | | | revert: correct test that added trailing newlineEdward Thomson2015-07-071-10/+12
| * | | | | | | | merge_files: don't add trailing newlinesEdward Thomson2015-07-071-0/+39
|/ / / / / / / /
* | | | | | | | Merge pull request #3298 from ethomson/gitauthorsEdward Thomson2015-07-071-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | meta: Add Antoine Pelisse to hall-of-fame listEdward Thomson2015-07-071-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #3277 from git-up/git_diff_index_to_indexCarlos Martín Nieto2015-07-073-0/+76
|\ \ \ \ \ \ \
| * | | | | | | Added git_diff_index_to_index()Pierre-Olivier Latour2015-06-303-0/+76
* | | | | | | | Merge pull request #3288 from ethomson/getenvCarlos Martín Nieto2015-07-0713-109/+199
|\ \ \ \ \ \ \ \
View Lorry Controller Status