summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3157 from mgorny/ssh_memory_authCarlos Martín Nieto2015-05-291-0/+24
|\
| * 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/+0
| * Add support to read ssh keys from memory.David Calavera2015-05-271-0/+28
* | Rename GIT_EMERGECONFLICT to GIT_ECONFLICTEdward Thomson2015-05-291-1/+1
* | Merge pull request #3139 from ethomson/diff_conflictsCarlos Martín Nieto2015-05-283-11/+24
|\ \
| * | Introduce `GIT_DIFF_FLAG_EXISTS`Edward Thomson2015-05-281-0/+1
| * | introduce `git_index_entry_is_conflict`Edward Thomson2015-05-281-0/+9
| * | diff/status: introduce conflictsEdward Thomson2015-05-282-10/+12
| * | conflicts: when adding conflicts, remove stagedEdward Thomson2015-05-281-1/+2
| |/
* | Merge pull request #3127 from libgit2/cmn/remote-fixupsCarlos Martín Nieto2015-05-281-32/+6
|\ \ | |/ |/|
| * remote: validate refspecs before adding to configCarlos Martín Nieto2015-05-281-2/+2
| * remote: remove fetch parameter from create_anonymousCarlos Martín Nieto2015-05-281-10/+4
| * remote: get rid of the run-time refspec settersCarlos Martín Nieto2015-05-171-20/+0
* | Fix error when building as C++.Jason Haslam2015-05-201-1/+1
* | Add a missing include for resetCarlos Martín Nieto2015-05-201-0/+1
* | errors: add GIT_EEOF to indicate early EOFcmn/server-errorsCarlos Martín Nieto2015-05-201-0/+1
|/
* Merge pull request #3118 from libgit2/cmn/stream-sizeEdward Thomson2015-05-133-4/+4
|\
| * odb: make the writestream's size a git_off_tcmn/stream-sizeCarlos Martín Nieto2015-05-133-4/+4
* | Merge pull request #3117 from libgit2/cmn/index-more-accurateEdward Thomson2015-05-131-10/+15
|\ \
| * | index: make the entries have more accurate sizescmn/index-more-accurateCarlos Martín Nieto2015-05-121-10/+15
| |/
* | remote: remove git_remote_save()Carlos Martín Nieto2015-05-131-15/+2
* | remote: remove live changing of refspecsCarlos Martín Nieto2015-05-131-19/+12
* | remote: move the tagopt setting to the fetch optionsCarlos Martín Nieto2015-05-131-18/+45
* | remote: move the update_fetchhead setting to the optionsCarlos Martín Nieto2015-05-131-18/+9
* | remote: move the transport ctor to the callbacksCarlos Martín Nieto2015-05-134-20/+15
* | remote: add prune option to fetchCarlos Martín Nieto2015-05-131-0/+20
* | remote: remove url and pushurl from the save logicCarlos Martín Nieto2015-05-131-10/+14
* | Remove the callbacks struct from the remoteCarlos Martín Nieto2015-05-136-204/+195
|/
* checkout: better document the `baseline_index` optEdward Thomson2015-05-111-1/+9
* stash_apply: provide progress callbacksEdward Thomson2015-05-111-0/+38
* stash_apply: provide its own options structureEdward Thomson2015-05-111-17/+50
* stash apply: default to at least GIT_CHECKOUT_SAFEEdward Thomson2015-05-111-1/+3
* stash: document merge conflictsEdward Thomson2015-05-111-13/+11
* stash: refactor to use merge_iteratorsEdward Thomson2015-05-111-6/+6
* checkout: allow baseline to be specified as indexEdward Thomson2015-05-111-0/+1
* Added git_stash_apply() and git_stash_pop() APIsPierre-Olivier Latour2015-05-111-4/+64
* checkout: break case-changes into delete/addEdward Thomson2015-05-041-1/+6
* Merge pull request #3059 from libgit2/cmn/negotiation-notifyEdward Thomson2015-05-013-0/+37
|\
| * push: report the update plan to the callercmn/negotiation-notifyCarlos Martín Nieto2015-04-193-0/+37
* | Update documentation for API changesjamill/doc_updateJameson Miller2015-04-301-1/+2
* | rebase: correct documentation, CHANGELOGEdward Thomson2015-04-201-8/+8
* | rebase: include checkout opts within rebase optsEdward Thomson2015-04-201-2/+3
* | rebase: init and open take a rebase_optionsEdward Thomson2015-04-201-24/+30
* | rebase: take `checkout_options` where appropriateEdward Thomson2015-04-201-2/+9
* | reset: `git_checkout_options` is `const`Edward Thomson2015-04-201-2/+2
* | rebase: identify a rebase that has not startedEdward Thomson2015-04-201-0/+6
|/
* Merge pull request #2999 from pks-t/submodule-set-urlEdward Thomson2015-04-171-0/+16
|\
| * Implement git_submodule_set_branch.Patrick Steinhardt2015-04-121-0/+16
* | Merge pull request #3037 from libgit2/cmn/hide-then-pushEdward Thomson2015-04-161-8/+10
|\ \