summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* local: send 'counting objects' outputcmn/local-proto-progressCarlos Martín Nieto2014-12-161-0/+52
* local: add failing test for sideband informationCarlos Martín Nieto2014-12-161-0/+34
* Merge pull request #2756 from libgit2/cmn/push-error-concernsEdward Thomson2014-12-105-29/+15
|\
| * push: reword comment on finish()cmn/push-error-concernsCarlos Martín Nieto2014-12-101-5/+7
| * push: fold unpack_ok() into finish()Carlos Martín Nieto2014-12-105-26/+10
|/
* Merge pull request #2678 from libgit2/cmn/io-streamEdward Thomson2014-12-1012-612/+857
|\
| * Fix a couple of compiler warningsCarlos Martín Nieto2014-12-102-2/+2
| * stream: constify the write bufferCarlos Martín Nieto2014-12-104-4/+4
| * gitno: remove code which is no longer neededCarlos Martín Nieto2014-12-105-500/+17
| * ssh: use socket_stream to perform the connectionCarlos Martín Nieto2014-12-101-8/+12
| * Port HTTP(S) to the new stream APICarlos Martín Nieto2014-12-101-61/+39
| * Port the TCP transport to the new stream APICarlos Martín Nieto2014-12-103-57/+93
| * Add an OpenSSL IO streamCarlos Martín Nieto2014-12-104-15/+418
| * Introduce stackable IO streamsCarlos Martín Nieto2014-12-103-0/+307
* | Merge pull request #2755 from libgit2/ntk/readme_appveyor_buildCarlos Martín Nieto2014-12-101-3/+4
|\ \
| * | readme: Add AppVeyor build status badge/linknulltoken2014-12-101-0/+1
| * | readme: Make Travis build status badge reflect the state of masternulltoken2014-12-101-1/+1
| * | readme: Trim trailing linesnulltoken2014-12-101-2/+2
|/ /
* | Merge pull request #2753 from ethomson/win32_leaksCarlos Martín Nieto2014-12-105-55/+122
|\ \
| * | winhttp: plug some leaksEdward Thomson2014-12-091-47/+67
| * | core::link test: clean up junction point nameEdward Thomson2014-12-091-7/+50
| * | win32: remember to free wide env name/valueEdward Thomson2014-12-091-1/+3
| * | win32: remember to cleanup our hash_ctxEdward Thomson2014-12-092-0/+2
|/ /
* | Merge pull request #2750 from linquize/generate.pyEdward Thomson2014-12-081-5/+5
|\ \
| * | Update clar to e3985ddLinquize2014-12-071-5/+5
* | | Merge pull request #2751 from linquize/broken-test-winEdward Thomson2014-12-083-3/+22
|\ \ \ | |/ / |/| |
| * | Fix broken merge tests due to autocrlf was not falseLinquize2014-12-072-0/+20
| * | Fix broken test suite on WindowsLinquize2014-12-071-3/+2
|/ /
* | Merge pull request #2746 from libgit2/cmn/neg-ignore-dirEdward Thomson2014-12-062-8/+100
|\ \
| * | ignore: match git's rule negation rulescmn/neg-ignore-dirCarlos Martín Nieto2014-12-051-3/+86
| * | ignore: adjust test for negating inside a dirCarlos Martín Nieto2014-12-051-5/+14
* | | Merge pull request #2748 from libgit2/cmn/doc-allEdward Thomson2014-12-0618-29/+127
|\ \ \
| * | | doc: add documentation to all the public structs and enumscmn/doc-allCarlos Martín Nieto2014-12-0618-29/+127
| |/ /
* | | Merge pull request #2730 from libgit2/cmn/local-pushEdward Thomson2014-12-053-12/+42
|\ \ \
| * | | local: adjust to the common refspec parsercmn/local-pushCarlos Martín Nieto2014-11-231-11/+6
| * | | remote: add test for pushing and deleting with the local transportCarlos Martín Nieto2014-11-231-0/+34
| * | | remote: verify there is a push foreach callback setCarlos Martín Nieto2014-11-231-1/+2
* | | | Merge pull request #2747 from libgit2/cmn/notes-consistencyEdward Thomson2014-12-058-21/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | notes: fix comments for git_note_next()cmn/notes-consistencyCarlos Martín Nieto2014-12-061-4/+2
| * | | notes: move the notes name argumentCarlos Martín Nieto2014-12-068-17/+20
|/ / /
* | | Rever spelling fixes for dependenciesCarlos Martín Nieto2014-12-052-2/+2
* | | Merge pull request #2744 from epmatsw/spellingnulltoken2014-12-0522-23/+23
|\ \ \
| * | | Spelling fixesWill Stamper2014-12-0422-23/+23
* | | | Merge pull request #2743 from ethomson/init_valCarlos Martín Nieto2014-12-054-18/+58
|\ \ \ \ | |/ / / |/| | |
| * | | init: return the number of initializationsEdward Thomson2014-12-044-18/+58
* | | | Merge pull request #2742 from stewid/add_missing_else_directiveCarlos Martín Nieto2014-12-031-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add missing else directiveStefan Widgren2014-12-031-0/+1
* | | | Merge pull request #2741 from ethomson/fetch-twiceCarlos Martín Nieto2014-12-031-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | win32: clear connection data on closeEdward Thomson2014-12-031-0/+1
|/ / /
* | | Merge pull request #2734 from jeffhostetler/jeffhostetler/git_mkfileEdward Thomson2014-12-011-1/+1
|\ \ \
View Lorry Controller Status