summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix some memleaksmergeEdward Thomson2012-12-125-50/+45
* create dirs on writing conflicting filesEdward Thomson2012-12-111-16/+34
* updated to latestEdward Thomson2012-12-116-32/+34
* df conflictsEdward Thomson2012-12-11124-161/+735
* merge refactor goodnessEdward Thomson2012-12-119-409/+606
* fix doc tagsEdward Thomson2012-12-111-2/+2
* write side filesEdward Thomson2012-12-113-44/+148
* set up merge filenamesEdward Thomson2012-12-112-28/+122
* refactorEdward Thomson2012-12-116-369/+365
* rebased old mergeEdward Thomson2012-12-1114-47/+2480
* treediffEdward Thomson2012-12-11232-0/+1350
* Merge pull request #1133 from arrbee/more-iterator-cleanupVicent Martí2012-12-1015-154/+311
|\
| * Fix iterator reset and add reset rangesRussell Belfer2012-12-108-119/+253
| * Clean up iterator APIsRussell Belfer2012-12-1011-35/+58
|/
* Add git_cred_acquire_cb payload to winhttp transportBen Straub2012-12-101-1/+1
* Merge pull request #1132 from ben/cred-acquire-payloadVicent Martí2012-12-1010-10/+25
|\
| * Add a payload param to git_cred_acquire_cbBen Straub2012-12-1010-10/+25
|/
* Clean up GCC build warningsBen Straub2012-12-102-3/+2
* Merge pull request #1126 from carlosmn/indexer-bufferVicent Martí2012-12-101-10/+9
|\
| * indexer: move the temporary buffers into the indexer objectCarlos Martín Nieto2012-12-071-10/+9
* | Merge pull request #1127 from libgit2/fix-mwindow-threadingVicent Martí2012-12-105-15/+54
|\ \ | |/ |/|
| * orite C89Justin Spahr-Summers2012-12-091-2/+2
| * Treat git_mutex_lock as successful when threads are disabledJustin Spahr-Summers2012-12-091-1/+1
| * Always check the result of git_mutex_lockJustin Spahr-Summers2012-12-093-14/+51
| * git__mwindow_mutex needs to be initialized even with pthreadsJustin Spahr-Summers2012-12-091-0/+2
|/
* Merge pull request #1091 from carlosmn/stream-objectVicent Martí2012-12-075-59/+282
|\
| * indexer: correctly deal with objects larger than the window sizeCarlos Martín Nieto2012-11-301-19/+26
| * indexer: make use of streaming also for deltasCarlos Martín Nieto2012-11-301-49/+78
| * indexer: use the packfile streaming APICarlos Martín Nieto2012-11-303-30/+137
| * pack: introduce a streaming API for raw objectsCarlos Martín Nieto2012-11-302-0/+80
* | Merge pull request #1123 from carlosmn/lax-treeVicent Martí2012-12-073-36/+48
|\ \
| * | tree: relax the filemode parserCarlos Martín Nieto2012-12-073-36/+48
|/ /
* | Allow compilation as C++Ben Straub2012-12-068-9/+9
* | travis: Try this keyVicent Marti2012-12-061-1/+1
* | travis: Fix this hookVicent Marti2012-12-061-1/+4
* | travis: Campfire notifications. Of course.Vicent Marti2012-12-061-0/+2
* | Merge pull request #1120 from arrbee/diff-header-fixesVicent Martí2012-12-052-10/+68
|\ \
| * | Fix diff header comments and missing constRussell Belfer2012-12-052-10/+68
|/ /
* | tests: MSVC fixVicent Marti2012-12-051-2/+0
* | versions: MSVC build fixesVicent Marti2012-12-052-6/+7
* | common: Silly vmg.Vicent Marti2012-12-051-1/+2
* | common: Silly MSVCVicent Marti2012-12-051-1/+2
* | Merge pull request #1115 from ben/struct-versionsVicent Martí2012-12-0554-111/+371
|\ \
| * | Don't unconstify when castingBen Straub2012-12-031-1/+1
| * | Remove GIT_SIGNATURE_VERSION and friendsBen Straub2012-12-038-24/+3
| * | Remove GIT_CRED_VERSION and friendsBen Straub2012-12-031-4/+0
| * | Make constant name all-capsBen Straub2012-11-301-1/+1
| * | Deploy GIT_INIT_STRUCTUREBen Straub2012-11-307-20/+15
| * | Deploy GITERR_CHECK_VERSIONBen Straub2012-11-3017-161/+38
| * | Deploy GIT_SIGNATURE_INITBen Straub2012-11-307-1/+38