Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | SecureTransport: handle graceful closescmn/secure-transport | Carlos Martín Nieto | 2015-04-23 | 1 | -2/+3 |
* | SecureTransport: require TLS v1.x | Carlos Martín Nieto | 2015-04-23 | 1 | -0/+2 |
* | Update THREADING and CHANGELOG with SecureTransport details | Carlos Martín Nieto | 2015-04-23 | 2 | -4/+17 |
* | SecureTransport: allow overriding a bad certificate | Carlos Martín Nieto | 2015-04-23 | 1 | -14/+41 |
* | Rename GIT_SSL to GIT_OPENSSL | Carlos Martín Nieto | 2015-04-23 | 10 | -16/+16 |
* | Silence unused warnings when not using OpenSSL | Carlos Martín Nieto | 2015-04-23 | 1 | -0/+4 |
* | Abstract away the TLS stream implementation | Carlos Martín Nieto | 2015-04-23 | 3 | -2/+51 |
* | Add a SecureTransport TLS channel | Carlos Martín Nieto | 2015-04-23 | 9 | -6/+283 |
* | Merge pull request #3064 from rcorre/config-write-fix | Carlos Martín Nieto | 2015-04-23 | 2 | -1/+42 |
|\ | |||||
| * | git_config_delete: search until last section. | Ryan Roden-Corrent | 2015-04-21 | 1 | -1/+4 |
| * | Specify mock config file content in test. | Ryan Roden-Corrent | 2015-04-21 | 2 | -10/+11 |
| * | Unittest to validate config entry deletion bug. | Ryan Roden-Corrent | 2015-04-21 | 2 | -0/+37 |
* | | Merge branch 'attr-ignore' | Carlos Martín Nieto | 2015-04-23 | 2 | -1/+26 |
|\ \ | |||||
| * | | attr_file: fix subdirectory attr case. | Mike McQuaid | 2015-04-23 | 1 | -1/+8 |
| * | | Add failing subdirectory gitignore attr test. | Mike McQuaid | 2015-04-23 | 1 | -0/+18 |
* | | | Merge pull request #3032 from jfultz/index-file-modes | Edward Thomson | 2015-04-23 | 3 | -9/+117 |
|\ \ \ | |||||
| * | | | Fix index-adding functions to know when to trust filemodes. | John Fultz | 2015-04-21 | 3 | -17/+90 |
| * | | | Oops...need bitwise, not logical negation. | John Fultz | 2015-04-16 | 1 | -2/+2 |
| * | | | Fix git_checkout_tree() to do index filemodes correctly on Windows. | John Fultz | 2015-04-06 | 2 | -2/+37 |
* | | | | Merge pull request #3065 from cthomas/master | Carlos Martín Nieto | 2015-04-22 | 2 | -51/+52 |
|\ \ \ \ | |||||
| * | | | | Fix for Issue #3023 tests fail with no network | cthomas | 2015-04-21 | 2 | -51/+52 |
|/ / / / | |||||
* | | | | Merge pull request #3051 from jeffhostetler/jeffhostetler/memleak_windows_tls... | Edward Thomson | 2015-04-21 | 3 | -11/+17 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Rename routine to free TLS data | Jeff Hostetler | 2015-04-18 | 3 | -4/+9 |
| * | | | Remove DllMain now that TLS data freed by threads | Jeff Hostetler | 2015-04-17 | 1 | -8/+0 |
| * | | | Also fix leak of TLS data on main thread. | Jeff Hostetler | 2015-04-17 | 1 | -4/+1 |
| * | | | Attempt to fix Windows TLS memory leak. | Jeff Hostetler | 2015-04-17 | 3 | -5/+17 |
* | | | | Merge pull request #2992 from ethomson/rebase_fixes | Carlos Martín Nieto | 2015-04-21 | 8 | -196/+311 |
|\ \ \ \ | |||||
| * | | | | rebase: correct documentation, CHANGELOG | Edward Thomson | 2015-04-20 | 2 | -9/+9 |
| * | | | | rebase: include checkout opts within rebase opts | Edward Thomson | 2015-04-20 | 3 | -17/+11 |
| * | | | | rebase: test checkout options for rebase | Edward Thomson | 2015-04-20 | 1 | -0/+49 |
| * | | | | rebase: init and open take a rebase_options | Edward Thomson | 2015-04-20 | 7 | -214/+205 |
| * | | | | rebase: take `checkout_options` where appropriate | Edward Thomson | 2015-04-20 | 6 | -39/+60 |
| * | | | | reset: `git_checkout_options` is `const` | Edward Thomson | 2015-04-20 | 2 | -5/+5 |
| * | | | | rebase: block rebase_commit with unstaged changes | Edward Thomson | 2015-04-20 | 3 | -20/+68 |
| * | | | | rebase: commit should return GIT_EUNMERGED | Edward Thomson | 2015-04-20 | 1 | -1/+3 |
| * | | | | rebase: identify a rebase that has not started | Edward Thomson | 2015-04-20 | 4 | -2/+12 |
* | | | | | Merge pull request #3060 from ethomson/2851 | Carlos Martín Nieto | 2015-04-21 | 2 | -62/+93 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | config_file: comment char can be invalid escape | Edward Thomson | 2015-04-20 | 2 | -2/+21 |
| * | | | | config_file: parse multilines generously | Edward Thomson | 2015-04-20 | 2 | -60/+72 |
* | | | | | Merge pull request #3024 from git-up/diff_merge_fix | Edward Thomson | 2015-04-19 | 1 | -2/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Make sure to also update delta->nfiles when merging diffs | Pierre-Olivier Latour | 2015-03-30 | 1 | -2/+8 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #3016 from pks-t/ignore-exclude-fix | Edward Thomson | 2015-04-17 | 2 | -5/+98 |
|\ \ \ \ | |||||
| * | | | | ignore: fix negative ignores without wildcards. | Patrick Steinhardt | 2015-04-17 | 2 | -5/+98 |
* | | | | | Merge pull request #2999 from pks-t/submodule-set-url | Edward Thomson | 2015-04-17 | 3 | -5/+67 |
|\ \ \ \ \ | |||||
| * | | | | | Implement git_submodule_set_branch. | Patrick Steinhardt | 2015-04-12 | 3 | -5/+67 |
* | | | | | | Merge pull request #3047 from git-up/diff_fixes | Edward Thomson | 2015-04-17 | 1 | -10/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed GIT_DIFF_UPDATE_INDEX not being aware of executable bit changes | Pierre-Olivier Latour | 2015-04-15 | 1 | -1/+1 |
| * | | | | | | Removed unnecessary condition | Pierre-Olivier Latour | 2015-04-15 | 1 | -9/+6 |
| * | | | | | | Use git_oid_cpy() instead of memcpy() | Pierre-Olivier Latour | 2015-04-15 | 1 | -1/+1 |
* | | | | | | | Merge pull request #3052 from jeffhostetler/jeffhostetler/memleak_test_core_m... | Edward Thomson | 2015-04-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | |