Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #3175 from git-up/build_warnings | Carlos Martín Nieto | 2015-06-07 | 8 | -10/+21 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fixed build warnings on Xcode 6.1 | Pierre-Olivier Latour | 2015-06-02 | 8 | -10/+21 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #3179 from arielb2/master | Carlos Martín Nieto | 2015-06-07 | 1 | -0/+2 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | print_usage functions is defined but not used | Ariel O. Barria | 2015-06-03 | 1 | -0/+2 | |
| |/ / / | ||||||
* | | | | Merge pull request #3172 from Therzok/patch-2 | Carlos Martín Nieto | 2015-06-04 | 1 | -1/+7 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Change error when running out of ssh agent keys | Marius Ungureanu | 2015-06-02 | 1 | -1/+7 | |
|/ / / | ||||||
* | | | Include git2/transaction.h | Carlos Martín Nieto | 2015-05-31 | 1 | -0/+1 | |
* | | | Merge pull request #3152 from tkelman/patch-1 | Carlos Martín Nieto | 2015-05-31 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * | | | build maint branches on appveyor | Tony Kelman | 2015-05-22 | 1 | -0/+1 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #3048 from pks-t/insteadof | Carlos Martín Nieto | 2015-05-31 | 5 | -5/+164 | |
|\ \ \ | ||||||
| * | | | remote: test insteadOf for anonymous remotes | Patrick Steinhardt | 2015-05-31 | 1 | -0/+12 | |
| * | | | Add CHANGELOG entry for url.*.insteadOf feature. | Patrick Steinhardt | 2015-05-31 | 1 | -0/+4 | |
| * | | | remote: apply insteadOf configuration. | Patrick Steinhardt | 2015-05-31 | 4 | -5/+148 | |
|/ / / | ||||||
* | | | CHANGELOG: fill in a few missing entries | Carlos Martín Nieto | 2015-05-29 | 1 | -5/+20 | |
* | | | Merge pull request #3157 from mgorny/ssh_memory_auth | Carlos Martín Nieto | 2015-05-29 | 5 | -1/+168 | |
|\ \ \ | ||||||
| * | | | test: Add a test for in-memory SSH private key cred_cb | Michał Górny | 2015-05-27 | 1 | -0/+68 | |
| * | | | cred: Check for null values when getting key from memory | Michał Górny | 2015-05-27 | 1 | -1/+4 | |
| * | | | cred: Declare GIT_CREDTYPE_SSH_MEMORY unconditionally | Michał Górny | 2015-05-27 | 2 | -4/+0 | |
| * | | | cmake: Add CMake check for libssh2 memory credential passing support | Michał Górny | 2015-05-27 | 1 | -0/+5 | |
| * | | | Return an error when ssh memory credentials are not supported. | David Calavera | 2015-05-27 | 2 | -4/+6 | |
| * | | | Add support to read ssh keys from memory. | David Calavera | 2015-05-27 | 3 | -1/+94 | |
| |/ / | ||||||
* | | | Merge pull request #3163 from ethomson/emergeconflict | Carlos Martín Nieto | 2015-05-29 | 7 | -18/+21 | |
|\ \ \ | ||||||
| * | | | Rename GIT_EMERGECONFLICT to GIT_ECONFLICT | Edward Thomson | 2015-05-29 | 7 | -18/+21 | |
* | | | | Merge pull request #3161 from fxfactorial/master | Edward Thomson | 2015-05-28 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Changed README to use new OCaml bindings to git | Edgar Aroutiounian | 2015-05-28 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #3139 from ethomson/diff_conflicts | Carlos Martín Nieto | 2015-05-28 | 28 | -177/+675 | |
|\ \ \ | ||||||
| * | | | index_add_all: remove conflicts when no wd file | Edward Thomson | 2015-05-28 | 1 | -1/+2 | |
| * | | | Introduce `GIT_DIFF_FLAG_EXISTS` | Edward Thomson | 2015-05-28 | 3 | -1/+12 | |
| * | | | git_index_add_all: test that conflicts are handled | Edward Thomson | 2015-05-28 | 1 | -49/+104 | |
| * | | | Introduce cl_git_sandbox_init_new() | Edward Thomson | 2015-05-28 | 2 | -0/+9 | |
| * | | | diff: prettify `maybe_modified` a little | Edward Thomson | 2015-05-28 | 1 | -12/+15 | |
| * | | | introduce `git_index_entry_is_conflict` | Edward Thomson | 2015-05-28 | 9 | -15/+34 | |
| * | | | conflict tests: use GIT_IDXENTRY_STAGE_SET | Edward Thomson | 2015-05-28 | 7 | -26/+26 | |
| * | | | diff conflicts: don't include incorrect ID | Edward Thomson | 2015-05-28 | 2 | -16/+67 | |
| * | | | diff conflicts: test index to workdir w/ conflicts | Edward Thomson | 2015-05-28 | 1 | -0/+45 | |
| * | | | diff conflicts: add tests for tree to index | Edward Thomson | 2015-05-28 | 3 | -2/+78 | |
| * | | | diff: for conflicts w/o workdir, blank nitem side | Edward Thomson | 2015-05-28 | 1 | -13/+26 | |
| * | | | diff/status: introduce conflicts | Edward Thomson | 2015-05-28 | 7 | -25/+93 | |
| * | | | index: validate mode of new conflicts | Edward Thomson | 2015-05-28 | 3 | -1/+23 | |
| * | | | index: remove error message in non-error remove | Edward Thomson | 2015-05-28 | 1 | -0/+3 | |
| * | | | conflicts: when adding conflicts, remove staged | Edward Thomson | 2015-05-28 | 5 | -3/+71 | |
| * | | | diff: wrap the iterator functions | Edward Thomson | 2015-05-28 | 1 | -25/+73 | |
| * | | | index iterator: optionally include conflicts | Edward Thomson | 2015-05-28 | 2 | -7/+13 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #3149 from libgit2/cmn/upstream-matching-push | Edward Thomson | 2015-05-28 | 4 | -3/+54 | |
|\ \ \ | ||||||
| * | | | branch: error out if we cannot find the remotecmn/upstream-matching-push | Carlos Martín Nieto | 2015-05-22 | 2 | -3/+38 | |
| * | | | refspec: make sure matching refspecs have src, dst and input strings | Carlos Martín Nieto | 2015-05-22 | 2 | -0/+16 | |
* | | | | Merge pull request #3127 from libgit2/cmn/remote-fixups | Carlos Martín Nieto | 2015-05-28 | 8 | -96/+88 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | remote: call the update_tips callback for opportunisitc updates | Carlos Martín Nieto | 2015-05-28 | 1 | -9/+31 | |
| * | | | remote: validate refspecs before adding to config | Carlos Martín Nieto | 2015-05-28 | 3 | -2/+14 | |
| * | | | remote: remove fetch parameter from create_anonymous | Carlos Martín Nieto | 2015-05-28 | 7 | -30/+17 |