summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* iterator: use correct search functionethomson/submodule_statusEdward Thomson2016-03-311-1/+1
* Merge pull request #3575 from pmq20/master-13jan16Carlos Martín Nieto2016-03-312-4/+0
|\
| * Remove duplicated calls to git_mwindow_closeP.S.V.R2016-01-132-4/+0
* | xdiff/xprepare: fix a memory leakPatrick Steinhardt2016-03-311-0/+1
* | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsPatrick Steinhardt2016-03-311-1/+1
* | Merge pull request #3712 from ethomson/config_duplicate_sectionCarlos Martín Nieto2016-03-291-4/+9
|\ \
| * | config: don't write section header if we're in itEdward Thomson2016-03-281-4/+9
* | | Merge pull request #3703 from libgit2/cmn/multivar-set-lockedEdward Thomson2016-03-281-17/+0
|\ \ \ | |/ / |/| |
| * | config: don't special-case multivars that don't exist yetcmn/multivar-set-lockedCarlos Martín Nieto2016-03-211-17/+0
* | | Merge pull request #3691 from ethomson/iteratorsCarlos Martín Nieto2016-03-2610-1595/+1703
|\ \ \
| * | | iterator: comment fixedMarc Strapetz2016-03-241-2/+2
| * | | iterator: unused includes removedMarc Strapetz2016-03-241-4/+0
| * | | iterator: cleanupsEdward Thomson2016-03-243-366/+54
| * | | iterator: refactor empty iterator to new styleEdward Thomson2016-03-241-15/+36
| * | | iterator: mandate `advance_over`Edward Thomson2016-03-242-6/+11
| * | | iterator: refactor index iteratorEdward Thomson2016-03-241-200/+194
| * | | Introduce `git_path_common_dirlen`Edward Thomson2016-03-242-0/+26
| * | | iterator: move the index into the iterator itselfEdward Thomson2016-03-242-36/+15
| * | | diff: stop processing nitem when its removedEdward Thomson2016-03-231-1/+1
| * | | iterator: drop `advance_into_or_over`Edward Thomson2016-03-232-20/+1
| * | | iterator: test that we're at the end of iterationEdward Thomson2016-03-231-1/+3
| * | | iterator: combine fs+workdir iterators more completelyEdward Thomson2016-03-234-944/+1082
| * | | checkout: provide internal func to compute target pathEdward Thomson2016-03-231-32/+54
| * | | iterators: refactored tree iteratorEdward Thomson2016-03-232-392/+630
| * | | git_object_dup: introduce typesafe versionsEdward Thomson2016-03-234-5/+23
| * | | iterator: disambiguate reset and reset_rangeEdward Thomson2016-03-234-28/+65
| * | | iterator: drop unused/unimplemented `seek`Edward Thomson2016-03-232-37/+0
* | | | Merge pull request #3574 from chescock/buffer-sideband-pack-dataCarlos Martín Nieto2016-03-241-17/+61
|\ \ \ \ | |/ / / |/| | |
| * | | Only buffer if necessary.Chris Hescock2016-03-081-18/+39
| * | | Buffer sideband packet dataChris Hescock2016-01-121-18/+41
| | |/ | |/|
* | | array: fix search for empty arraysCarlos Martín Nieto2016-03-231-1/+1
* | | Merge pull request #3704 from ethomson/tree-reuseCarlos Martín Nieto2016-03-233-46/+70
|\ \ \
| * | | tree: drop the now-unnecessary entries vectorEdward Thomson2016-03-223-46/+70
* | | | blob: remove _fromchunks()cmn/createblob-streamCarlos Martín Nieto2016-03-221-60/+0
* | | | blob: introduce creating a blob by writing into a streamCarlos Martín Nieto2016-03-221-0/+92
* | | | filebuf: allow using a custom buffer sizeCarlos Martín Nieto2016-03-222-1/+7
* | | | Merge pull request #3559 from yongthecoder/masterCarlos Martín Nieto2016-03-221-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Avoid subtraction overflow in git_indexer_commitYong Li2016-01-041-2/+7
* | | | tree: store the entries in a growable arraycmn/tree-reuseCarlos Martín Nieto2016-03-202-60/+38
* | | | tree: re-use the id and filename in the odb objectCarlos Martín Nieto2016-03-206-51/+64
| |_|/ |/| |
* | | Merge pull request #3699 from libgit2/cmn/win32-free-tlsEdward Thomson2016-03-181-0/+14
|\ \ \
| * | | win32: free thread-local data on thread exitcmn/win32-free-tlsCarlos Martin Nieto2016-03-181-0/+14
* | | | merge drivers: handle configured but not found driverEdward Thomson2016-03-171-4/+13
* | | | merge driver: remove `check` callbackEdward Thomson2016-03-174-120/+68
* | | | merge driver: correct global initializationEdward Thomson2016-03-175-94/+160
* | | | merge driver: get a pointer to favorEdward Thomson2016-03-172-4/+9
* | | | merge driver: correct indentationEdward Thomson2016-03-172-30/+30
* | | | merge driver: allow custom default driverEdward Thomson2016-03-173-42/+70
* | | | merge driver: introduce custom merge driversEdward Thomson2016-03-174-129/+623
* | | | Fix rebase bug and include test for merge=unionStan Hu2016-03-171-1/+1