summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | rebase: block rebase_commit with unstaged changesEdward Thomson2015-04-203-20/+68
| * | | | rebase: commit should return GIT_EUNMERGEDEdward Thomson2015-04-201-1/+3
| * | | | rebase: identify a rebase that has not startedEdward Thomson2015-04-204-2/+12
* | | | | Merge pull request #3060 from ethomson/2851Carlos Martín Nieto2015-04-212-62/+93
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | config_file: comment char can be invalid escapeEdward Thomson2015-04-202-2/+21
| * | | | config_file: parse multilines generouslyEdward Thomson2015-04-202-60/+72
* | | | | Merge pull request #3024 from git-up/diff_merge_fixEdward Thomson2015-04-191-2/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make sure to also update delta->nfiles when merging diffsPierre-Olivier Latour2015-03-301-2/+8
| | |_|/ | |/| |
* | | | Merge pull request #3016 from pks-t/ignore-exclude-fixEdward Thomson2015-04-172-5/+98
|\ \ \ \
| * | | | ignore: fix negative ignores without wildcards.Patrick Steinhardt2015-04-172-5/+98
* | | | | Merge pull request #2999 from pks-t/submodule-set-urlEdward Thomson2015-04-173-5/+67
|\ \ \ \ \
| * | | | | Implement git_submodule_set_branch.Patrick Steinhardt2015-04-123-5/+67
* | | | | | Merge pull request #3047 from git-up/diff_fixesEdward Thomson2015-04-171-10/+7
|\ \ \ \ \ \
| * | | | | | Fixed GIT_DIFF_UPDATE_INDEX not being aware of executable bit changesPierre-Olivier Latour2015-04-151-1/+1
| * | | | | | Removed unnecessary conditionPierre-Olivier Latour2015-04-151-9/+6
| * | | | | | Use git_oid_cpy() instead of memcpy()Pierre-Olivier Latour2015-04-151-1/+1
* | | | | | | Merge pull request #3052 from jeffhostetler/jeffhostetler/memleak_test_core_m...Edward Thomson2015-04-171-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |