summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Revert "object: correct the expected ID size in prefix lookup"Vicent Marti2015-06-261-5/+5
* Only write index if updated when passing GIT_DIFF_UPDATE_INDEXPierre-Olivier Latour2015-06-262-2/+5
* Merge pull request #3255 from libgit2/cmn/rename-unspecifiedEdward Thomson2015-06-255-7/+7
|\
| * Rename FALLBACK to UNSPECIFIEDcmn/rename-unspecifiedCarlos Martín Nieto2015-06-255-7/+7
* | Merge pull request #3256 from libgit2/cmn/fetch-spec-fetchheadEdward Thomson2015-06-251-3/+14
|\ \
| * | remote: insert refspecs with no rhs in FETCH_HEADcmn/fetch-spec-fetchheadCarlos Martín Nieto2015-06-251-3/+14
* | | Merge pull request #3246 from libgit2/cmn/dont-grow-borrowedEdward Thomson2015-06-253-9/+11
|\ \ \ | |_|/ |/| |
| * | buffer: make use of EINVALID for growing a borrowed bufferCarlos Martín Nieto2015-06-241-2/+4
| * | buffer: don't allow growing borrowed buffersCarlos Martín Nieto2015-06-243-9/+9
* | | Merge pull request #3097 from libgit2/cmn/submodule-config-stateCarlos Martín Nieto2015-06-248-680/+421
|\ \ \
| * | | submodule: handle writing out all enum values for settingsCarlos Martín Nieto2015-06-222-65/+21
| * | | config: provide a function to reverse-lookup mapped cvarsCarlos Martín Nieto2015-06-222-0/+26
| * | | submodule: get rid of `_save()`Carlos Martín Nieto2015-06-221-38/+0
| * | | submodule: make `_set_url()` affect the configurationCarlos Martín Nieto2015-06-221-12/+3
| * | | submodule: make `_set_branch()` affect the configurationCarlos Martín Nieto2015-06-221-48/+28
| * | | submodule: make `_set_update_fetch_recurse_submodules()` affect the configCarlos Martín Nieto2015-06-221-18/+26
| * | | submodule: make `_set_update()` affect the configurationCarlos Martín Nieto2015-06-221-24/+28
| * | | submodule: correct detection of existing submodulesCarlos Martín Nieto2015-06-221-10/+26
| * | | submodule: bring back finding by pathCarlos Martín Nieto2015-06-221-0/+42
| * | | submodule: add an ignore option to statusCarlos Martín Nieto2015-06-223-6/+6
| * | | submodule: don't let status change an existing instanceCarlos Martín Nieto2015-06-223-6/+15
| * | | submodule: make set_ignore() affect the configurationCarlos Martín Nieto2015-06-221-15/+22
| * | | submodule: remove the per-repo cacheCarlos Martín Nieto2015-06-225-530/+270
* | | | Merge pull request #3183 from libgit2/cmn/curl-streamCarlos Martín Nieto2015-06-246-14/+430
|\ \ \ \
| * | | | SecureTransport: use the curl stream if availablecmn/curl-streamCarlos Martín Nieto2015-06-241-1/+17
| * | | | curl: remove the encrypted param to the constructorCarlos Martín Nieto2015-06-244-14/+6
| * | | | http: ask for the curl stream for non-encrypted connectionsCarlos Martín Nieto2015-06-241-4/+4
| * | | | openssl: use the curl stream if availableCarlos Martín Nieto2015-06-241-12/+110
| * | | | curl: extract certificate informationCarlos Martín Nieto2015-06-241-3/+34
| * | | | http: set the proxy if the stream supports itCarlos Martín Nieto2015-06-241-0/+11
| * | | | stream: add support for setting a proxyCarlos Martín Nieto2015-06-242-0/+30
| * | | | Implement a curl streamCarlos Martín Nieto2015-06-243-1/+239
| | |/ / | |/| |
* | | | Merge pull request #3254 from ethomson/diff-binary-patchCarlos Martín Nieto2015-06-242-12/+32
|\ \ \ \
| * | | | diff: determine DIFFABLE-ness for binariesEdward Thomson2015-06-242-12/+32
| |/ / /
* | | | Merge pull request #3250 from ethomson/stashCarlos Martín Nieto2015-06-243-60/+69
|\ \ \ \ | |/ / / |/| | |
| * | | stash: save the workdir file when deleted in indexEdward Thomson2015-06-233-14/+46
| * | | git_diff__merge: allow pluggable diff mergesEdward Thomson2015-06-232-3/+19
| * | | diff_tform: remove reversed copy of delta mergerEdward Thomson2015-06-231-46/+7
| | |/ | |/|
* | | Fixed invalid error handling in git_repository_open_ext()Pierre-Olivier Latour2015-06-231-1/+1
* | | Merge pull request #3222 from git-up/conflictedEdward Thomson2015-06-231-2/+4
|\ \ \
| * | | Fixed GIT_DELTA_CONFLICTED not returned in some casesPierre-Olivier Latour2015-06-231-2/+4
| |/ /
* | | Merge pull request #3226 from libgit2/cmn/racy-diff-againEdward Thomson2015-06-234-5/+65
|\ \ \
| * | | index: check racily clean entries more thoroughlyCarlos Martín Nieto2015-06-221-2/+41
| * | | diff: check files with the same or newer timestampsCarlos Martín Nieto2015-06-223-3/+24
* | | | repository: check the format versioncmn/repo-version-checkCarlos Martín Nieto2015-06-231-9/+26
* | | | repository: don't error out if there is no versionCarlos Martín Nieto2015-06-231-2/+7
| |/ / |/| |
* | | Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()Pierre-Olivier Latour2015-06-221-0/+11
* | | crlf: give Unix the glory of autocrlf=trueEdward Thomson2015-06-221-13/+14
* | | git_buf_text_lf_to_crlf: allow mixed line endingsEdward Thomson2015-06-222-8/+5
* | | crlf: use statistics to control to workdir filterEdward Thomson2015-06-221-4/+25
View Lorry Controller Status