summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* CMake: fall back to OpenSSL on older OS Xcmn/old-securityCarlos Martín Nieto2015-08-191-2/+12
* Merge pull request #3387 from leoyanggit/build_warningCarlos Martín Nieto2015-08-181-0/+1
|\
| * Fix build warning: implicit declaration of function ‘git_transaction_config...Leo Yang2015-08-171-0/+1
|/
* Merge pull request #3377 from dleehr/fix-push-cbEdward Thomson2015-08-151-1/+1
|\
| * Fix bug in git_smart__push: push_transfer_progress cb is never calledDan Leehr2015-08-131-1/+1
* | Merge pull request #3384 from libgit2/cmn/regex-nofailEdward Thomson2015-08-152-7/+32
|\ \
| * | diff: don't error out on an invalid regexcmn/regex-nofailCarlos Martín Nieto2015-08-152-7/+32
* | | Merge pull request #3383 from libgit2/cmn/http-errorEdward Thomson2015-08-151-1/+9
|\ \ \ | |/ / |/| |
| * | http: propagate the credentials callback's error codecmn/http-errorCarlos Martín Nieto2015-08-151-1/+9
|/ /
* | Merge pull request #3362 from libgit2/cmn/curl-proxyauth-anyCarlos Martín Nieto2015-08-141-0/+1
|\ \
| * | curl: use the most secure auth method for the proxycmn/curl-proxyauth-anyCarlos Martín Nieto2015-08-061-0/+1
* | | Merge pull request #3168 from libgit2/cmn/config-txEdward Thomson2015-08-1310-18/+298
|\ \ \
| * | | config: perform unlocking via git_transactioncmn/config-txCarlos Martín Nieto2015-08-127-26/+92
| * | | config: expose locking via the main APICarlos Martín Nieto2015-08-124-19/+90
| * | | config: implement basic transactional supportCarlos Martín Nieto2015-08-124-12/+151
| * | | config: write the modified file to memoryCarlos Martín Nieto2015-08-121-8/+12
* | | | Merge pull request #3372 from libgit2/cmn/mirror-refspecEdward Thomson2015-08-122-9/+44
|\ \ \ \ | |/ / / |/| | |
| * | | remote: don't confuse tag auto-follow rules with refspec matchingcmn/mirror-refspecCarlos Martín Nieto2015-08-111-4/+10
| * | | remote: add failing test for a mirror refspecCarlos Martín Nieto2015-08-111-5/+34
| |/ /
* | | Merge pull request #3363 from ripdev/masterCarlos Martín Nieto2015-08-121-1/+1
|\ \ \ | |/ / |/| |
| * | Forcing libssh2 lib locationSlava Karpenko2015-08-061-1/+1
|/ /
* | Merge pull request #3360 from nodegit/master-duplicate-basename-fixEdward Thomson2015-08-054-4/+3
|\ \
| * | Fix duplicate basenames to support older VSJohn Haley2015-08-054-4/+3
|/ /
* | Merge pull request #3351 from ethomson/error_bufCarlos Martín Nieto2015-08-049-72/+149
|\ \
| * | errors: tighten up git_error_state OOMs a bit moreEdward Thomson2015-08-036-46/+86
| * | Merge remote-tracking branches 'upstream/pr/3323' and 'upstream/pr/3329'Edward Thomson2015-08-033-23/+42
| |\ \
| | * | error: store the error messages in a reusable buffercmn/error-bufferCarlos Martín Nieto2015-07-283-23/+42
| * | | Test: check restored oom error points to static bufferMichael Procter2015-08-031-4/+4
| * | | Make giterr_restore aware of g_git_oom_errorMichael Procter2015-08-031-8/+11
| * | | Make giterr_detach no longer publicMichael Procter2015-08-032-13/+1
| * | | Ensure static oom error message not detachedMichael Procter2015-08-031-2/+6
| * | | Add failing test for capture/restore oom errorMichael Procter2015-08-031-0/+23
|/ / /
* | | Merge pull request #3325 from libgit2/cmn/filebuf-rename-errorEdward Thomson2015-08-033-1/+35
|\ \ \
| * | | filebuf: remove lockfile upon rename errorscmn/filebuf-rename-errorCarlos Martín Nieto2015-07-243-2/+9
| * | | filebuf: failing test for leaving the lockfile when failing to renameCarlos Martín Nieto2015-07-241-0/+27
* | | | Merge pull request #3344 from libgit2/cmn/add-unreg-submoduleEdward Thomson2015-08-032-5/+71
|\ \ \ \
| * | | | index: stage an unregistered submodule as wellcmn/add-unreg-submoduleCarlos Martín Nieto2015-08-011-5/+58
| * | | | index: test that an unregistered submodule gets stagedCarlos Martín Nieto2015-08-011-1/+7
| * | | | index: add test for adding an old-style submodule to indexLinquize2015-08-011-0/+7
* | | | | Merge pull request #3348 from MrHacky/remote-path-with-tildeCarlos Martín Nieto2015-08-032-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Handle ssh:// and git:// urls containing a '~' character.Simon2015-08-032-0/+4
|/ / / /
* | | | Merge pull request #3332 from phatblat/ben/doc-warningsCarlos Martín Nieto2015-08-018-10/+13
|\ \ \ \
| * | | | Better param docsBen Chatelain2015-07-281-1/+3
| * | | | Fix remaining documentation warningsBen Chatelain2015-07-274-4/+4
| * | | | Add -Wdocumentation flag if supportedBen Chatelain2015-07-271-0/+1
| * | | | Use correct Doxygen trailing comment syntaxBen Chatelain2015-07-271-4/+4
| * | | | Fix @param names in doc commentsBen Chatelain2015-07-273-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #3341 from stewid/pedantic-compiler-warningEdward Thomson2015-07-315-6/+6
|\ \ \ \
| * | | | Remove extra semicolon outside of a functionStefan Widgren2015-07-315-6/+6
|/ / / /
* | | | Merge pull request #3328 from libgit2/cmn/iterator-skip-diriterEdward Thomson2015-07-292-6/+5
|\ \ \ \