summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* travis: disable the cert callback on OSXcmn/disable-ssh-checkCarlos Martín Nieto2014-11-201-1/+4
* Remove two completed projects from the listCarlos Martín Nieto2014-11-181-3/+0
* Merge pull request #2654 from linquize/missing-objEdward Thomson2014-11-188-3/+5
|\
| * Fix missing object in tests/resources/crlf by changing the tail commitLinquize2014-10-268-3/+5
* | Merge pull request #2608 from libgit2/cmn/remote-pushEdward Thomson2014-11-185-59/+214
|\ \
| * | remote: use configured push refspecs if none are givencmn/remote-pushCarlos Martín Nieto2014-11-093-8/+53
| * | push: move main test function to git_remote_push()Carlos Martín Nieto2014-11-093-59/+80
| * | remote: introduce git_remote_push()Carlos Martín Nieto2014-11-093-1/+90
* | | Merge pull request #2671 from swisspol/remote_create_fixEdward Thomson2014-11-172-0/+39
|\ \ \
| * | | Fixed active_refspecs field not initialized on new git_remote objectsPierre-Olivier Latour2014-11-172-0/+39
* | | | Merge pull request #2693 from libgit2/cmn/push-refspec-refactorEdward Thomson2014-11-177-73/+45
|\ \ \ \
| * | | | push: use the common refspec parsercmn/push-refspec-refactorCarlos Martín Nieto2014-11-097-73/+45
* | | | | Merge pull request #2699 from swisspol/fix_warningsEdward Thomson2014-11-172-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed a couple Clang warningsPierre-Olivier Latour2014-11-102-1/+4
| | |/ / | |/| |
* | | | branch: consider an empty upstream remote config as not foundCarlos Martín Nieto2014-11-172-0/+22
* | | | Merge branch 'openssl-lock-free'Carlos Martín Nieto2014-11-171-0/+6
|\ \ \ \
| * | | | Plug possible leak in the openssl locksUngureanu Marius2014-11-171-0/+6
* | | | | Merge pull request #2707 from swisspol/fix_includeCarlos Martín Nieto2014-11-151-1/+2
|\ \ \ \ \
| * | | | | Fixed git2.h not including threads.h anymorePierre-Olivier Latour2014-11-151-1/+2
| |/ / / /
* | | | | Merge pull request #2708 from phatblat/pr/threading-docCarlos Martín Nieto2014-11-151-3/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix GCD typoBen Chatelain2014-11-141-3/+4
|/ / / /
* | | | Merge pull request #2653 from ethomson/contributingCarlos Martín Nieto2014-11-091-14/+40
|\ \ \ \
| * | | | Add instructions on running the testsEdward Thomson2014-10-241-9/+33
| * | | | Fix grammar of licensing sentence, add IRC linksWaldir Pimenta2014-10-241-5/+7
| | |_|/ | |/| |
* | | | Merge pull request #2637 from libgit2/cmn/global-initEdward Thomson2014-11-0822-67/+88
|\ \ \ \ | |_|/ / |/| | |
| * | | Rename git_threads_ to git_libgit2_Carlos Martín Nieto2014-11-0822-67/+88
|/ / /
* | | Merge pull request #2673 from swisspol/2672Edward Thomson2014-11-084-19/+25
|\ \ \
| * | | Changed GIT_REMOTE_DOWNLOAD_TAGS_ALL to behave like git 1.9.0Pierre-Olivier Latour2014-11-094-19/+25
|/ / /
* | | Merge pull request #2698 from libgit2/cmn/fetchhead-refactorEdward Thomson2014-11-085-25/+90
|\ \ \
| * | | remote: refactor the reference-update decisioncmn/fetchhead-refactorCarlos Martín Nieto2014-11-081-26/+36
| * | | remote: don't check for upstream on an anonymous remoteCarlos Martín Nieto2014-11-082-0/+11
| * | | remote: use git_branch_upstream_remote()Carlos Martín Nieto2014-11-081-7/+8
| * | | branch: add getter for the upstream remote nameCarlos Martín Nieto2014-11-083-0/+43
* | | | Merge pull request #2695 from libgit2/cmn/remote-lookupEdward Thomson2014-11-0819-42/+45
|\ \ \ \
| * | | | remote: rename _load() to _lookup()cmn/remote-lookupCarlos Martín Nieto2014-11-0819-42/+45
| |/ / /
* | | | Merge pull request #2696 from libgit2/cmn/empty-objectsEdward Thomson2014-11-082-1/+62
|\ \ \ \
| * | | | odb: hardcode the empty blob and treecmn/empty-objectsCarlos Martín Nieto2014-11-082-1/+62
| |/ / /
* | | | Merge pull request #2694 from Therzok/statusFileEdward Thomson2014-11-084-5/+8
|\ \ \ \ | |/ / / |/| | |
| * | | git_status_file now takes an exact pathUngureanu Marius2014-11-074-5/+8
|/ / /
* | | Merge pull request #2691 from libgit2/cmn/submodule-and-dirEdward Thomson2014-11-0712-31/+167
|\ \ \
| * | | iterator: submodules are determined by an index or treecmn/submodule-and-dirCarlos Martín Nieto2014-11-0711-31/+119
| * | | submodules: add failing test for stale module entriesCarlos Martín Nieto2014-11-071-0/+48
|/ / /
* | | Merge pull request #2692 from ethomson/bug2515Carlos Martín Nieto2014-11-073-64/+280
|\ \ \
| * | | checkout_index: Remove stage 0 when checking out conflictsEdward Thomson2014-11-062-13/+56
| * | | checkout_index: remove conflicts when checking out new filesEdward Thomson2014-11-062-51/+224
|/ / /
* | | Merge pull request #2598 from libgit2/cmn/stacked-ignoreEdward Thomson2014-11-063-0/+60
|\ \ \
| * | | ignore: don't leak rules into higher directoriescmn/stacked-ignoreCarlos Martín Nieto2014-11-062-0/+28
| * | | ignore: add failing test for a file mentioning the parentCarlos Martín Nieto2014-11-061-0/+32
| | |/ | |/|
* | | Merge pull request #2676 from libgit2/cmn/threadingEdward Thomson2014-11-064-18/+124
|\ \ \
| * | | docs: explicitly document the threading caveatscmn/threadingCarlos Martín Nieto2014-11-012-0/+84