| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | 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 | |
| | * | | | remote: get rid of the run-time refspec setters | Carlos Martín Nieto | 2015-05-17 | 3 | -42/+10 | |
| | * | | | clone: don't rely on auto-saving for single-branch | Carlos Martín Nieto | 2015-05-17 | 1 | -10/+13 | |
| | * | | | Fix typos in the CHANGELOG | Carlos Martín Nieto | 2015-05-17 | 1 | -3/+3 | |
| * | | | | Merge pull request #3160 from b4n/ident-same-as-git | Carlos Martín Nieto | 2015-05-28 | 5 | -17/+17 | |
| |\ \ \ \ | |_|_|/ |/| | | | ||||||
| | * | | | Fix ident replacement to match Git behavior | Colomban Wendling | 2015-05-26 | 5 | -17/+17 | |
| |/ / / | ||||||
| * | | | Merge pull request #3151 from ethomson/thinpack | Carlos Martín Nieto | 2015-05-22 | 2 | -1/+21 | |
| |\ \ \ | ||||||
| | * | | | indexer: avoid loading already existent bases | Edward Thomson | 2015-05-22 | 1 | -1/+14 | |
| | * | | | indexer: don't look for the index we're creating | Edward Thomson | 2015-05-22 | 1 | -0/+7 | |
| * | | | | Merge pull request #3108 from libgit2/cmn/ssl-no-want | Edward Thomson | 2015-05-22 | 1 | -16/+5 | |
| |\ \ \ \ | |/ / / |/| | | | ||||||
| | * | | | openssl: don't try to handle WANT_READ or WANT_WRITEcmn/ssl-no-want | Carlos Martín Nieto | 2015-05-09 | 1 | -16/+5 | |
| * | | | | travis: build maint branches | Carlos Martín Nieto | 2015-05-22 | 1 | -1/+1 | |
| | |_|/ |/| | | ||||||
| * | | | Merge branch 'sni' | Carlos Martín Nieto | 2015-05-21 | 1 | -0/+3 | |
| |\ \ \ | ||||||
| | * | | | Call the openssl API to be able to work with SNI servers. | Cristian Oneț | 2015-05-21 | 1 | -0/+3 | |
| * | | | | Merge pull request #3145 from stinb/fix_cxx_build | Carlos Martín Nieto | 2015-05-21 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix error when building as C++. | Jason Haslam | 2015-05-20 | 1 | -1/+1 | |
| * | | | | | Merge pull request #3146 from ethomson/add_untracked_files | Carlos Martín Nieto | 2015-05-21 | 2 | -1/+26 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | git_index_add_all: don't recurse ignored dirs | Edward Thomson | 2015-05-20 | 1 | -2/+1 | |
| | * | | | | | index_add_all: include untracked files in new subdirs | Edward Thomson | 2015-05-20 | 2 | -1/+27 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #3144 from libgit2/cmn/ignored-ignore | Edward Thomson | 2015-05-20 | 2 | -0/+13 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| | * | | | | ignore: clear the error when matching a pattern negationcmn/ignored-ignore | Carlos Martín Nieto | 2015-05-20 | 2 | -0/+13 | |
| |/ / / / | ||||||
| * | | | | Add a missing include for reset | Carlos Martín Nieto | 2015-05-20 | 1 | -0/+1 | |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |