summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* path: error out if the callback returns an errorcmn/foreach-cancel-looseCarlos Martín Nieto2015-06-062-2/+24
* Merge pull request #3172 from Therzok/patch-2Carlos Martín Nieto2015-06-041-1/+7
|\
| * Change error when running out of ssh agent keysMarius Ungureanu2015-06-021-1/+7
|/
* Include git2/transaction.hCarlos Martín Nieto2015-05-311-0/+1
* Merge pull request #3152 from tkelman/patch-1Carlos Martín Nieto2015-05-311-0/+1
|\
| * build maint branches on appveyorTony Kelman2015-05-221-0/+1
* | Merge pull request #3048 from pks-t/insteadofCarlos Martín Nieto2015-05-315-5/+164
|\ \
| * | remote: test insteadOf for anonymous remotesPatrick Steinhardt2015-05-311-0/+12
| * | Add CHANGELOG entry for url.*.insteadOf feature.Patrick Steinhardt2015-05-311-0/+4
| * | remote: apply insteadOf configuration.Patrick Steinhardt2015-05-314-5/+148
|/ /
* | CHANGELOG: fill in a few missing entriesCarlos Martín Nieto2015-05-291-5/+20
* | Merge pull request #3157 from mgorny/ssh_memory_authCarlos Martín Nieto2015-05-295-1/+168
|\ \
| * | test: Add a test for in-memory SSH private key cred_cbMichał Górny2015-05-271-0/+68
| * | cred: Check for null values when getting key from memoryMichał Górny2015-05-271-1/+4
| * | cred: Declare GIT_CREDTYPE_SSH_MEMORY unconditionallyMichał Górny2015-05-272-4/+0
| * | cmake: Add CMake check for libssh2 memory credential passing supportMichał Górny2015-05-271-0/+5
| * | Return an error when ssh memory credentials are not supported.David Calavera2015-05-272-4/+6
| * | Add support to read ssh keys from memory.David Calavera2015-05-273-1/+94
| |/
* | Merge pull request #3163 from ethomson/emergeconflictCarlos Martín Nieto2015-05-297-18/+21
|\ \
| * | Rename GIT_EMERGECONFLICT to GIT_ECONFLICTEdward Thomson2015-05-297-18/+21
* | | Merge pull request #3161 from fxfactorial/masterEdward Thomson2015-05-281-1/+1
|\ \ \ | |/ / |/| |
| * | Changed README to use new OCaml bindings to gitEdgar Aroutiounian2015-05-281-1/+1
|/ /
* | Merge pull request #3139 from ethomson/diff_conflictsCarlos Martín Nieto2015-05-2828-177/+675
|\ \
| * | index_add_all: remove conflicts when no wd fileEdward Thomson2015-05-281-1/+2
| * | Introduce `GIT_DIFF_FLAG_EXISTS`Edward Thomson2015-05-283-1/+12
| * | git_index_add_all: test that conflicts are handledEdward Thomson2015-05-281-49/+104
| * | Introduce cl_git_sandbox_init_new()Edward Thomson2015-05-282-0/+9
| * | diff: prettify `maybe_modified` a littleEdward Thomson2015-05-281-12/+15
| * | introduce `git_index_entry_is_conflict`Edward Thomson2015-05-289-15/+34
| * | conflict tests: use GIT_IDXENTRY_STAGE_SETEdward Thomson2015-05-287-26/+26
| * | diff conflicts: don't include incorrect IDEdward Thomson2015-05-282-16/+67
| * | diff conflicts: test index to workdir w/ conflictsEdward Thomson2015-05-281-0/+45
| * | diff conflicts: add tests for tree to indexEdward Thomson2015-05-283-2/+78
| * | diff: for conflicts w/o workdir, blank nitem sideEdward Thomson2015-05-281-13/+26
| * | diff/status: introduce conflictsEdward Thomson2015-05-287-25/+93
| * | index: validate mode of new conflictsEdward Thomson2015-05-283-1/+23
| * | index: remove error message in non-error removeEdward Thomson2015-05-281-0/+3
| * | conflicts: when adding conflicts, remove stagedEdward Thomson2015-05-285-3/+71
| * | diff: wrap the iterator functionsEdward Thomson2015-05-281-25/+73
| * | index iterator: optionally include conflictsEdward Thomson2015-05-282-7/+13
* | | Merge pull request #3149 from libgit2/cmn/upstream-matching-pushEdward Thomson2015-05-284-3/+54
|\ \ \
| * | | branch: error out if we cannot find the remotecmn/upstream-matching-pushCarlos Martín Nieto2015-05-222-3/+38
| * | | refspec: make sure matching refspecs have src, dst and input stringsCarlos Martín Nieto2015-05-222-0/+16
* | | | Merge pull request #3127 from libgit2/cmn/remote-fixupsCarlos Martín Nieto2015-05-288-96/+88
|\ \ \ \ | |_|/ / |/| | |
| * | | remote: call the update_tips callback for opportunisitc updatesCarlos Martín Nieto2015-05-281-9/+31
| * | | remote: validate refspecs before adding to configCarlos Martín Nieto2015-05-283-2/+14
| * | | remote: remove fetch parameter from create_anonymousCarlos Martín Nieto2015-05-287-30/+17
| * | | remote: get rid of the run-time refspec settersCarlos Martín Nieto2015-05-173-42/+10
| * | | clone: don't rely on auto-saving for single-branchCarlos Martín Nieto2015-05-171-10/+13
| * | | Fix typos in the CHANGELOGCarlos Martín Nieto2015-05-171-3/+3