summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | push: report the update plan to the callercmn/negotiation-notifyCarlos Martín Nieto2015-04-197-7/+91
* | | | Merge pull request #3081 from leoyanggit/build_warningsEdward Thomson2015-05-013-8/+8
|\ \ \ \
| * | | | Fix some build warningsLeo Yang2015-04-283-8/+8
| | |_|/ | |/| |
* | | | Merge pull request #3090 from libgit2/jamill/doc_updateCarlos Martín Nieto2015-04-302-1/+4
|\ \ \ \
| * | | | Update documentation for API changesjamill/doc_updateJameson Miller2015-04-302-1/+4
| | |_|/ | |/| |
* | | | Merge pull request #3088 from volftomas/patch-1Carlos Martín Nieto2015-04-301-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed unused warning in tests/rebase/merge.cTomas Paladin Volf2015-04-301-0/+5
|/ / /
* | | Merge pull request #3085 from yongthecoder/regfreeCarlos Martín Nieto2015-04-291-3/+2
|\ \ \ | |/ / |/| |
| * | Do not call regfree() on an empty regex that is not successfully created by r...Yong Li2015-04-291-3/+2
|/ /
* | Merge pull request #3071 from linquize/git_reflog_dropEdward Thomson2015-04-241-1/+1
|\ \
| * | Fix wrong format string in git_reflog_drop() error messageLinquize2015-04-241-1/+1
* | | Merge pull request #3063 from ethomson/config_validate_nameCarlos Martín Nieto2015-04-243-14/+112
|\ \ \
| * | | config: peek returns '\n' on EOF; handle in writeEdward Thomson2015-04-231-1/+1
| * | | config: ensure we can write to an empty fileEdward Thomson2015-04-231-0/+35
| * | | config: validate config keysEdward Thomson2015-04-231-13/+41
| * | | config: test that we validate the keyEdward Thomson2015-04-231-0/+35
* | | | Merge pull request #2997 from libgit2/cmn/secure-transportEdward Thomson2015-04-2317-23/+396
|\ \ \ \ | |/ / / |/| | |
| * | | SecureTransport: handle graceful closescmn/secure-transportCarlos Martín Nieto2015-04-231-2/+3
| * | | SecureTransport: require TLS v1.xCarlos Martín Nieto2015-04-231-0/+2
| * | | Update THREADING and CHANGELOG with SecureTransport detailsCarlos Martín Nieto2015-04-232-4/+17
| * | | SecureTransport: allow overriding a bad certificateCarlos Martín Nieto2015-04-231-14/+41
| * | | Rename GIT_SSL to GIT_OPENSSLCarlos Martín Nieto2015-04-2310-16/+16
| * | | Silence unused warnings when not using OpenSSLCarlos Martín Nieto2015-04-231-0/+4
| * | | Abstract away the TLS stream implementationCarlos Martín Nieto2015-04-233-2/+51
| * | | Add a SecureTransport TLS channelCarlos Martín Nieto2015-04-239-6/+283
|/ / /
* | | Merge pull request #3064 from rcorre/config-write-fixCarlos Martín Nieto2015-04-232-1/+42
|\ \ \
| * | | git_config_delete: search until last section.Ryan Roden-Corrent2015-04-211-1/+4
| * | | Specify mock config file content in test.Ryan Roden-Corrent2015-04-212-10/+11
| * | | Unittest to validate config entry deletion bug.Ryan Roden-Corrent2015-04-212-0/+37
* | | | Merge branch 'attr-ignore'Carlos Martín Nieto2015-04-232-1/+26
|\ \ \ \
| * | | | attr_file: fix subdirectory attr case.Mike McQuaid2015-04-231-1/+8
| * | | | Add failing subdirectory gitignore attr test.Mike McQuaid2015-04-231-0/+18
* | | | | Merge pull request #3032 from jfultz/index-file-modesEdward Thomson2015-04-233-9/+117
|\ \ \ \ \
| * | | | | Fix index-adding functions to know when to trust filemodes.John Fultz2015-04-213-17/+90
| * | | | | Oops...need bitwise, not logical negation.John Fultz2015-04-161-2/+2
| * | | | | Fix git_checkout_tree() to do index filemodes correctly on Windows.John Fultz2015-04-062-2/+37
* | | | | | Merge pull request #3065 from cthomas/masterCarlos Martín Nieto2015-04-222-51/+52
|\ \ \ \ \ \
| * | | | | | Fix for Issue #3023 tests fail with no networkcthomas2015-04-212-51/+52
|/ / / / / /
* | | | | | Merge pull request #3051 from jeffhostetler/jeffhostetler/memleak_windows_tls...Edward Thomson2015-04-213-11/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Rename routine to free TLS dataJeff Hostetler2015-04-183-4/+9
| * | | | | Remove DllMain now that TLS data freed by threadsJeff Hostetler2015-04-171-8/+0
| * | | | | Also fix leak of TLS data on main thread.Jeff Hostetler2015-04-171-4/+1
| * | | | | Attempt to fix Windows TLS memory leak.Jeff Hostetler2015-04-173-5/+17
* | | | | | Merge pull request #2992 from ethomson/rebase_fixesCarlos Martín Nieto2015-04-218-196/+311
|\ \ \ \ \ \
| * | | | | | rebase: correct documentation, CHANGELOGEdward Thomson2015-04-202-9/+9
| * | | | | | rebase: include checkout opts within rebase optsEdward Thomson2015-04-203-17/+11
| * | | | | | rebase: test checkout options for rebaseEdward Thomson2015-04-201-0/+49
| * | | | | | rebase: init and open take a rebase_optionsEdward Thomson2015-04-207-214/+205
| * | | | | | rebase: take `checkout_options` where appropriateEdward Thomson2015-04-206-39/+60
| * | | | | | reset: `git_checkout_options` is `const`Edward Thomson2015-04-202-5/+5