summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #3263 from git-up/fixesCarlos Martín Nieto2015-06-264-4/+2
|\ \ | |/ |/|
| * Removed unused variablesPierre-Olivier Latour2015-06-262-2/+0
| * Fixed build failure if GIT_CURL is not definedPierre-Olivier Latour2015-06-262-2/+2
* | Merge pull request #3259 from ethomson/stash_apply_arghCarlos Martín Nieto2015-06-266-95/+323
|\ \
| * | stash: stage new files when unstashing themEdward Thomson2015-06-252-2/+128
| * | iterator: provide git_iterator_walkEdward Thomson2015-06-253-86/+133
| * | stash: don't allow apply with staged changesEdward Thomson2015-06-253-1/+45
| * | stash apply: add a newly staged file to testsEdward Thomson2015-06-251-8/+19
* | | Merge pull request #3262 from libgit2/vmg/prefix-lenCarlos Martín Nieto2015-06-263-19/+34
|\ \ \ | |_|/ |/| |
| * | test-diff-blob: Pass proper nibble sizesvmg/prefix-lenVicent Marti2015-06-261-14/+14
| * | revparse: Add test to make sure this doesn't regressVicent Marti2015-06-261-0/+15
| * | Revert "object: correct the expected ID size in prefix lookup"Vicent Marti2015-06-261-5/+5
|/ /
* | Merge pull request #3261 from libgit2/cmn/link-one-levelCarlos Martín Nieto2015-06-261-3/+3
|\ \
| * | pc: Put libcurl and libssh2 in Libs.privatecmn/link-one-levelCarlos Martín Nieto2015-06-261-3/+3
|/ /
* | Merge pull request #3234 from ethomson/dont_update_index_unnecessarilyCarlos Martín Nieto2015-06-263-9/+74
|\ \
| * | Only write index if updated when passing GIT_DIFF_UPDATE_INDEXPierre-Olivier Latour2015-06-262-2/+5
| * | diff: test we don't update index unnecessarilyEdward Thomson2015-06-261-7/+69
|/ /
* | Merge pull request #3255 from libgit2/cmn/rename-unspecifiedEdward Thomson2015-06-2513-26/+26
|\ \
| * | Rename FALLBACK to UNSPECIFIEDcmn/rename-unspecifiedCarlos Martín Nieto2015-06-2513-26/+26
* | | Merge pull request #3258 from arthurschreiber/patch-6Carlos Martín Nieto2015-06-261-0/+1
|\ \ \ | |_|/ |/| |
| * | List `libcurl` in the generated `libgit2.pc`Arthur Schreiber2015-06-251-0/+1
|/ /
* | Merge pull request #3256 from libgit2/cmn/fetch-spec-fetchheadEdward Thomson2015-06-252-3/+58
|\ \
| * | remote: insert refspecs with no rhs in FETCH_HEADcmn/fetch-spec-fetchheadCarlos Martín Nieto2015-06-252-3/+58
* | | Merge pull request #3246 from libgit2/cmn/dont-grow-borrowedEdward Thomson2015-06-257-15/+35
|\ \ \ | |_|/ |/| |
| * | Add CHANGELOG entriescmn/dont-grow-borrowedCarlos Martín Nieto2015-06-241-0/+6
| * | buffer: make use of EINVALID for growing a borrowed bufferCarlos Martín Nieto2015-06-242-3/+5
| * | errors: introduce EINVALIDCarlos Martín Nieto2015-06-241-0/+1
| * | blob: don't recomment using git_buf_growCarlos Martín Nieto2015-06-241-6/+4
| * | buffer: don't allow growing borrowed buffersCarlos Martín Nieto2015-06-244-9/+22
* | | Merge pull request #3097 from libgit2/cmn/submodule-config-stateCarlos Martín Nieto2015-06-2420-1015/+616
|\ \ \
| * | | submodule: remove the RESET enum valuescmn/submodule-config-stateCarlos Martín Nieto2015-06-222-9/+1
| * | | submodule: test unsetting config optionsCarlos Martín Nieto2015-06-221-13/+29
| * | | 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
| * | | examples: adjust to submodule status API changeCarlos Martín Nieto2015-06-221-16/+10
| * | | submodule: test more accurately for non-existenceCarlos Martín Nieto2015-06-221-4/+4
| * | | submodule: fix potential leak in the testsCarlos Martín Nieto2015-06-221-2/+1
| * | | submodule: get rid of `_save()`Carlos Martín Nieto2015-06-223-61/+0
| * | | submodule: make `_set_url()` affect the configurationCarlos Martín Nieto2015-06-224-61/+17
| * | | submodule: make `_set_branch()` affect the configurationCarlos Martín Nieto2015-06-223-70/+53
| * | | submodule: make `_set_update_fetch_recurse_submodules()` affect the configCarlos Martín Nieto2015-06-223-53/+49
| * | | submodule: make `_set_update()` affect the configurationCarlos Martín Nieto2015-06-223-58/+47
| * | | 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-2210-61/+50
| * | | submodule: don't let status change an existing instanceCarlos Martín Nieto2015-06-226-24/+44
| * | | submodule: make set_ignore() affect the configurationCarlos Martín Nieto2015-06-225-56/+50
| * | | submodule: remove the per-repo cacheCarlos Martín Nieto2015-06-227-576/+270
* | | | Merge pull request #3183 from libgit2/cmn/curl-streamCarlos Martín Nieto2015-06-2411-23/+475
|\ \ \ \
| * | | | SecureTransport: use the curl stream if availablecmn/curl-streamCarlos Martín Nieto2015-06-241-1/+17