summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Get rid of libssh2 embeddingcmn/remove-ssh-embedCarlos Martín Nieto2015-05-121-13/+2
* Merge pull request #3111 from whoisj/centralizing-buffer-sizesCarlos Martín Nieto2015-05-127-9/+12
|\
| * centralizing all IO buffer size valuesJ Wyman2015-05-117-9/+12
* | Merge pull request #3018 from ethomson/stash_applyCarlos Martín Nieto2015-05-1214-49/+1076
|\ \ | |/ |/|
| * checkout: better document the `baseline_index` optEdward Thomson2015-05-112-1/+12
| * stash application: document new API in CHANGELOGEdward Thomson2015-05-111-0/+6
| * stash: propagate the error when writing a treeEdward Thomson2015-05-111-1/+1
| * stash_apply: provide progress callbacksEdward Thomson2015-05-113-3/+106
| * stash_apply: provide its own options structureEdward Thomson2015-05-114-62/+128
| * stash: test checkout notify callbacksEdward Thomson2015-05-111-0/+52
| * stash apply: default to at least GIT_CHECKOUT_SAFEEdward Thomson2015-05-112-3/+6
| * stash: return GIT_EMERGECONFLICT on merge conflictEdward Thomson2015-05-112-4/+2
| * stash: document merge conflictsEdward Thomson2015-05-111-13/+11
| * stash: refactor to use merge_iteratorsEdward Thomson2015-05-113-190/+111
| * stash: ensure a reflog has entriesEdward Thomson2015-05-111-2/+2
| * stash apply: check out a tree, not piecewiseEdward Thomson2015-05-112-34/+13
| * stash: use git_commit_summary for a summaryEdward Thomson2015-05-111-12/+4
| * index: introduce git_index_read_indexEdward Thomson2015-05-113-0/+173
| * checkout: allow baseline to be specified as indexEdward Thomson2015-05-112-5/+15
| * merge: merge iteratorsEdward Thomson2015-05-113-25/+93
| * Added git_stash_apply() and git_stash_pop() APIsPierre-Olivier Latour2015-05-114-4/+651
|/
* Merge pull request #3104 from whoisj/optimal-buffer-sizeCarlos Martín Nieto2015-05-091-1/+1
|\
| * Adjusting stream buffer size to 64KBJ Wyman2015-05-071-1/+1
* | Merge pull request #3086 from yongthecoder/masterCarlos Martín Nieto2015-05-062-4/+2
|\ \
| * | Android build doesn't need deps/regexYong Li2015-05-042-4/+2
* | | Merge pull request #3100 from arthurschreiber/patch-5Carlos Martín Nieto2015-05-061-0/+2
|\ \ \
| * | | Ensure frameworks are mentioned in libgit2.pcArthur Schreiber2015-05-051-0/+2
|/ / /
* | | config: plug a couple of leaksCarlos Martín Nieto2015-05-051-4/+7
* | | Merge pull request #3079 from ethomson/configCarlos Martín Nieto2015-05-042-400/+640
|\ \ \
| * | | config: test all multivars are updatedEdward Thomson2015-05-041-6/+16
| * | | config: use wildcard in test instead of empty exprEdward Thomson2015-05-041-1/+1
| * | | config: cleanup some now-unused variablesEdward Thomson2015-05-042-9/+16
| * | | config: lock the file for write before readingEdward Thomson2015-05-041-8/+7
| * | | Test setting config var under duplicate header.Ryan Roden-Corrent2015-05-041-0/+49
| * | | config: write existing lines as-is when rewritingEdward Thomson2015-05-041-28/+70
| * | | config: examine whole file when writingEdward Thomson2015-05-042-396/+421
| * | | config: test overwriting cvar in multiple regionsEdward Thomson2015-05-041-0/+36
| * | | config: ensure we can write to an empty fileEdward Thomson2015-05-041-0/+72
* | | | Merge pull request #3070 from ethomson/checkout_icaseCarlos Martín Nieto2015-05-046-25/+253
|\ \ \ \ | |/ / / |/| | |
| * | | checkout test: better case-insensitive test on MacEdward Thomson2015-05-041-3/+29
| * | | status test: always test the new file pathEdward Thomson2015-05-041-8/+12
| * | | checkout test: only run icase on icase platformEdward Thomson2015-05-042-79/+61
| * | | checkout: break case-changes into delete/addEdward Thomson2015-05-043-2/+21
| * | | checkout: remove blocking dir when FORCEdEdward Thomson2015-05-042-10/+117
| * | | Revert "Always checkout with case sensitive iterator"Edward Thomson2015-05-042-3/+14
| * | | checkout test: ensure we write to casechanged dirEdward Thomson2015-05-041-0/+57
| * | | checkout test: ignore unstaged case-changing renamesEdward Thomson2015-05-041-0/+22
|/ / /
* | | Merge pull request #3087 from ethomson/pr/3054Carlos Martín Nieto2015-05-0422-358/+852
|\ \ \
| * | | diriter: actually use iconv on macEdward Thomson2015-05-012-86/+94
| * | | git_buf_put_w: introduce utf16->utf8 conversionEdward Thomson2015-05-015-27/+81
View Lorry Controller Status