summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Introduce cl_git_sandbox_init_new()Edward Thomson2015-05-282-0/+9
| * | | | diff: prettify `maybe_modified` a littleEdward Thomson2015-05-281-12/+15
| * | | | introduce `git_index_entry_is_conflict`Edward Thomson2015-05-289-15/+34
| * | | | conflict tests: use GIT_IDXENTRY_STAGE_SETEdward Thomson2015-05-287-26/+26
| * | | | diff conflicts: don't include incorrect IDEdward Thomson2015-05-282-16/+67
| * | | | diff conflicts: test index to workdir w/ conflictsEdward Thomson2015-05-281-0/+45
| * | | | diff conflicts: add tests for tree to indexEdward Thomson2015-05-283-2/+78
| * | | | diff: for conflicts w/o workdir, blank nitem sideEdward Thomson2015-05-281-13/+26
| * | | | diff/status: introduce conflictsEdward Thomson2015-05-287-25/+93
| * | | | index: validate mode of new conflictsEdward Thomson2015-05-283-1/+23
| * | | | index: remove error message in non-error removeEdward Thomson2015-05-281-0/+3
| * | | | conflicts: when adding conflicts, remove stagedEdward Thomson2015-05-285-3/+71
| * | | | diff: wrap the iterator functionsEdward Thomson2015-05-281-25/+73
| * | | | index iterator: optionally include conflictsEdward Thomson2015-05-282-7/+13
| | |/ / | |/| |
* | | | Merge pull request #3149 from libgit2/cmn/upstream-matching-pushEdward Thomson2015-05-284-3/+54
|\ \ \ \
| * | | | branch: error out if we cannot find the remotecmn/upstream-matching-pushCarlos Martín Nieto2015-05-222-3/+38
| * | | | refspec: make sure matching refspecs have src, dst and input stringsCarlos Martín Nieto2015-05-222-0/+16
* | | | | Merge pull request #3127 from libgit2/cmn/remote-fixupsCarlos Martín Nieto2015-05-288-96/+88
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | remote: call the update_tips callback for opportunisitc updatesCarlos Martín Nieto2015-05-281-9/+31
| * | | | remote: validate refspecs before adding to configCarlos Martín Nieto2015-05-283-2/+14
| * | | | remote: remove fetch parameter from create_anonymousCarlos Martín Nieto2015-05-287-30/+17
| * | | | remote: get rid of the run-time refspec settersCarlos Martín Nieto2015-05-173-42/+10
| * | | | clone: don't rely on auto-saving for single-branchCarlos Martín Nieto2015-05-171-10/+13
| * | | | Fix typos in the CHANGELOGCarlos Martín Nieto2015-05-171-3/+3
* | | | | Merge pull request #3160 from b4n/ident-same-as-gitCarlos Martín Nieto2015-05-285-17/+17
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix ident replacement to match Git behaviorColomban Wendling2015-05-265-17/+17
|/ / / /
* | | | Merge pull request #3151 from ethomson/thinpackCarlos Martín Nieto2015-05-222-1/+21
|\ \ \ \
| * | | | indexer: avoid loading already existent basesEdward Thomson2015-05-221-1/+14
| * | | | indexer: don't look for the index we're creatingEdward Thomson2015-05-221-0/+7
* | | | | Merge pull request #3108 from libgit2/cmn/ssl-no-wantEdward Thomson2015-05-221-16/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | openssl: don't try to handle WANT_READ or WANT_WRITEcmn/ssl-no-wantCarlos Martín Nieto2015-05-091-16/+5
* | | | | travis: build maint branchesCarlos Martín Nieto2015-05-221-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'sni'Carlos Martín Nieto2015-05-211-0/+3
|\ \ \ \
| * | | | Call the openssl API to be able to work with SNI servers.Cristian Oneț2015-05-211-0/+3
* | | | | Merge pull request #3145 from stinb/fix_cxx_buildCarlos Martín Nieto2015-05-211-1/+1
|\ \ \ \ \
| * | | | | Fix error when building as C++.Jason Haslam2015-05-201-1/+1
* | | | | | Merge pull request #3146 from ethomson/add_untracked_filesCarlos Martín Nieto2015-05-212-1/+26
|\ \ \ \ \ \
| * | | | | | git_index_add_all: don't recurse ignored dirsEdward Thomson2015-05-201-2/+1
| * | | | | | index_add_all: include untracked files in new subdirsEdward Thomson2015-05-202-1/+27
| |/ / / / /
* | | | | | Merge pull request #3144 from libgit2/cmn/ignored-ignoreEdward Thomson2015-05-202-0/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | ignore: clear the error when matching a pattern negationcmn/ignored-ignoreCarlos Martín Nieto2015-05-202-0/+13
|/ / / / /
* | | | | Add a missing include for resetCarlos Martín Nieto2015-05-201-0/+1
* | | | | Merge pull request #3137 from libgit2/cmn/server-errorsCarlos Martín Nieto2015-05-205-3/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | errors: add GIT_EEOF to indicate early EOFcmn/server-errorsCarlos Martín Nieto2015-05-205-4/+15
| * | | | ssh: read from stderr if stdout is emptyCarlos Martín Nieto2015-05-202-1/+12
|/ / / /
* | | | Merge pull request #3109 from libgit2/cmn/index-use-diffEdward Thomson2015-05-193-69/+118
|\ \ \ \
| * | | | index: add a CHANGELOG entry for the diff usagecmn/index-use-diffCarlos Martín Nieto2015-05-141-0/+3
| * | | | index: include TYPECHANGE in the diffCarlos Martín Nieto2015-05-142-1/+15
| * | | | index: make add_all to act on a diffCarlos Martín Nieto2015-05-141-80/+28
| * | | | index: refactor diff-based update_all to match other appliesCarlos Martín Nieto2015-05-141-80/+87