summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* indexer: use lseek to extend the packfilecmn/idx-fill-holeCarlos Martín Nieto2015-06-021-3/+4
* remote: apply insteadOf configuration.Patrick Steinhardt2015-05-311-5/+70
* Merge pull request #3157 from mgorny/ssh_memory_authCarlos Martín Nieto2015-05-292-1/+71
|\
| * 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-271-2/+0
| * Return an error when ssh memory credentials are not supported.David Calavera2015-05-271-2/+6
| * Add support to read ssh keys from memory.David Calavera2015-05-272-1/+66
* | Rename GIT_EMERGECONFLICT to GIT_ECONFLICTEdward Thomson2015-05-293-5/+5
* | Merge pull request #3139 from ethomson/diff_conflictsCarlos Martín Nieto2015-05-287-86/+258
|\ \
| * | index_add_all: remove conflicts when no wd fileEdward Thomson2015-05-281-1/+2
| * | Introduce `GIT_DIFF_FLAG_EXISTS`Edward Thomson2015-05-281-1/+6
| * | diff: prettify `maybe_modified` a littleEdward Thomson2015-05-281-12/+15
| * | introduce `git_index_entry_is_conflict`Edward Thomson2015-05-284-11/+17
| * | diff conflicts: don't include incorrect IDEdward Thomson2015-05-281-16/+21
| * | diff: for conflicts w/o workdir, blank nitem sideEdward Thomson2015-05-281-13/+26
| * | diff/status: introduce conflictsEdward Thomson2015-05-283-13/+71
| * | index: validate mode of new conflictsEdward Thomson2015-05-281-0/+9
| * | index: remove error message in non-error removeEdward Thomson2015-05-281-0/+3
| * | conflicts: when adding conflicts, remove stagedEdward Thomson2015-05-281-1/+16
| * | 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-282-3/+12
|\ \ \
| * | | branch: error out if we cannot find the remotecmn/upstream-matching-pushCarlos Martín Nieto2015-05-221-3/+6
| * | | refspec: make sure matching refspecs have src, dst and input stringsCarlos Martín Nieto2015-05-221-0/+6
* | | | Merge pull request #3127 from libgit2/cmn/remote-fixupsCarlos Martín Nieto2015-05-281-33/+49
|\ \ \ \ | |_|/ / |/| | |
| * | | 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-281-0/+10
| * | | remote: remove fetch parameter from create_anonymousCarlos Martín Nieto2015-05-281-2/+2
| * | | remote: get rid of the run-time refspec settersCarlos Martín Nieto2015-05-171-22/+6
* | | | Fix ident replacement to match Git behaviorColomban Wendling2015-05-261-2/+2
| |_|/ |/| |
* | | Merge pull request #3151 from ethomson/thinpackCarlos Martín Nieto2015-05-222-1/+21
|\ \ \
| * | | indexer: avoid loading already existent basesEdward Thomson2015-05-221-1/+14
| * | | indexer: don't look for the index we're creatingEdward Thomson2015-05-221-0/+7
| | |/ | |/|
* | | Merge pull request #3108 from libgit2/cmn/ssl-no-wantEdward Thomson2015-05-221-16/+5
|\ \ \ | |/ / |/| |
| * | openssl: don't try to handle WANT_READ or WANT_WRITEcmn/ssl-no-wantCarlos Martín Nieto2015-05-091-16/+5
* | | Merge branch 'sni'Carlos Martín Nieto2015-05-211-0/+3
|\ \ \
| * | | Call the openssl API to be able to work with SNI servers.Cristian Oneț2015-05-211-0/+3
* | | | Merge pull request #3146 from ethomson/add_untracked_filesCarlos Martín Nieto2015-05-211-1/+3
|\ \ \ \
| * | | | git_index_add_all: don't recurse ignored dirsEdward Thomson2015-05-201-2/+1
| * | | | index_add_all: include untracked files in new subdirsEdward Thomson2015-05-201-1/+4
* | | | | ignore: clear the error when matching a pattern negationcmn/ignored-ignoreCarlos Martín Nieto2015-05-201-0/+1
|/ / / /
* | | | errors: add GIT_EEOF to indicate early EOFcmn/server-errorsCarlos Martín Nieto2015-05-203-4/+9
* | | | ssh: read from stderr if stdout is emptyCarlos Martín Nieto2015-05-201-1/+8
|/ / /
* | | Merge pull request #3109 from libgit2/cmn/index-use-diffEdward Thomson2015-05-191-69/+102
|\ \ \
| * | | index: include TYPECHANGE in the diffCarlos Martín Nieto2015-05-141-1/+2
| * | | index: make add_all to act on a diffCarlos Martín Nieto2015-05-141-80/+28
| * | | index: refactor diff-based update_all to match other appliesCarlos Martín Nieto2015-05-141-80/+87
| * | | index: use a diff to perform update_allCarlos Martín Nieto2015-05-141-2/+79
* | | | fileops: set an error on write error for file copycmn/path-direach-cberrorCarlos Martín Nieto2015-05-171-0/+3
* | | | fileops: set an error message if we fail to link a fileCarlos Martín Nieto2015-05-151-1/+2