summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| * | ssl: separate locking init from general initCarlos Martín Nieto2014-11-012-18/+39
| * | ssl: clear the OpenSSL locking functionCarlos Martín Nieto2014-11-011-0/+1
* | | Merge pull request #2682 from libgit2/cmn/fetch-tags-refspecEdward Thomson2014-11-062-0/+28
|\ \ \ | |_|/ |/| |
| * | remote: check the relevance of the refspec when updating FETCH_HEADcmn/fetch-tags-refspecCarlos Martín Nieto2014-11-031-0/+1
| * | remote: add a failing test for checking the current branch's upstreamCarlos Martín Nieto2014-11-021-0/+27
* | | Merge pull request #2688 from libgit2/cmn/ignore-file-trailing-crEdward Thomson2014-11-052-1/+42
|\ \ \
| * | | ignore: consider files with a CR in their namescmn/ignore-file-trailing-crCarlos Martín Nieto2014-11-052-1/+42
* | | | Merge pull request #2686 from ethomson/rename_notfoundCarlos Martín Nieto2014-11-032-1/+10
|\ \ \ \
| * | | | git_remote_rename: propogate GIT_ENOTFOUNDEdward Thomson2014-11-032-1/+10
|/ / / /
* | | | Merge pull request #2679 from jfultz/missing-includeEdward Thomson2014-11-032-6/+28
|\ \ \ \
| * | | | Clean up issues include.path issues found during code review.John Fultz2014-11-022-5/+13
| * | | | Make config reading continue after hitting a missing include file.John Fultz2014-11-012-7/+21
| | |_|/ | |/| |
* | | | Merge pull request #2661 from swisspol/2656Edward Thomson2014-11-033-3/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemi...Pierre-Olivier Latour2014-10-273-3/+8
* | | | Merge pull request #2683 from libgit2/cmn/remote-unifyEdward Thomson2014-11-031-21/+2
|\ \ \ \
| * | | | remote: unify the creation codecmn/remote-unifyCarlos Martín Nieto2014-11-021-21/+2
* | | | | Merge pull request #2680 from libgit2/cmn/invalid-cert-returnEdward Thomson2014-11-031-1/+1
|\ \ \ \ \
| * | | | | netops: return GIT_ECERTIFICATE when it fails the basic testscmn/invalid-cert-returnCarlos Martín Nieto2014-11-021-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #2685 from libgit2/cmn/mmap-readableEdward Thomson2014-11-031-4/+2
|\ \ \ \ \
| * | | | | Fix segmentation fault observed on OpenBSD/sparc64cmn/mmap-readableStefan Sperling2014-11-031-4/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #2684 from jacquesg/openssl-windowsEdward Thomson2014-11-031-7/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make the Visual Studio compiler happyJacques Germishuys2014-11-031-7/+8
|/ / / /
* | | | remote: fix tagopt testCarlos Martín Nieto2014-11-021-7/+7
| |_|/ |/| |
View Lorry Controller Status