Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Fix build on mingw-w64 | Alex Crichton | 2015-03-16 | 1 | -2/+2 | |
| * | | | | | | patch so mingw-w64 can build | klutzy | 2015-03-16 | 2 | -0/+16 | |
| * | | | | | | Win32: Enable WinHTTP for MinGW | Philip Kelley | 2015-03-16 | 8 | -34/+735 | |
* | | | | | | | Merge pull request #2947 from libgit2/cmn/notes-buf | Edward Thomson | 2015-03-24 | 5 | -28/+57 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | note: use a git_buf to return the default namespacecmn/notes-buf | Carlos Martín Nieto | 2015-03-17 | 5 | -28/+57 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2858 from pks-t/remote-squashed | Carlos Martín Nieto | 2015-03-24 | 3 | -1/+279 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | examples: add remote example. | Patrick Steinhardt | 2015-03-19 | 3 | -1/+279 | |
* | | | | | | | | Merge pull request #3010 from ethomson/checkout_invalid_path_err | Carlos Martín Nieto | 2015-03-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | checkout: report correct invalid path | Edward Thomson | 2015-03-23 | 1 | -1/+1 | |
* | | | | | | | | git: make sure to close the network stream | Carlos Martín Nieto | 2015-03-21 | 1 | -0/+1 | |
* | | | | | | | | Merge pull request #3003 from shawnl/master | Edward Thomson | 2015-03-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | fix changelog | Shawn Landden | 2015-03-20 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #3000 from libgit2/vmg/mkdir-ext | Edward Thomson | 2015-03-19 | 1 | -5/+14 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | mkdir-ext: Retry lstat on EEXIST racevmg/mkdir-ext | Vicent Marti | 2015-03-19 | 1 | -5/+14 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2996 from ethomson/dll_comments | Carlos Martín Nieto | 2015-03-19 | 1 | -2/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | win32 resource: allow custom comments field in DLL | Edward Thomson | 2015-03-18 | 1 | -2/+6 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #2967 from jacquesg/merge-whitespace | Edward Thomson | 2015-03-18 | 57 | -17/+261 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Added changelog entries for whitespace and patience merges. | Jacques Germishuys | 2015-03-17 | 1 | -0/+12 | |
| * | | | | | Added options to enable patience and minimal diff drivers | Jacques Germishuys | 2015-03-16 | 2 | -0/+12 | |
| * | | | | | Collapse whitespace flags into git_merge_file_flags_t | Jacques Germishuys | 2015-03-16 | 5 | -35/+23 | |
| * | | | | | Renamed git_merge_options 'flags' to 'tree_flags' | Jacques Germishuys | 2015-03-16 | 6 | -12/+12 | |
| * | | | | | Added tests to merge files and branches with whitespace problems and fixes | Jacques Germishuys | 2015-03-16 | 49 | -0/+198 | |
| * | | | | | Allow for merges with whitespace discrepancies | Jacques Germishuys | 2015-03-16 | 3 | -4/+38 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #2993 from ethomson/clar_update | Carlos Martín Nieto | 2015-03-18 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | clar: update to 08f434d | Edward Thomson | 2015-03-17 | 1 | -1/+1 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #2955 from git-up/update_tips_fixes | Carlos Martín Nieto | 2015-03-18 | 2 | -13/+18 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fixed active refspecs not reset by git_remote_upload() | Pierre-Olivier Latour | 2015-03-11 | 1 | -0/+4 | |
| * | | | | | Fixed update_tips callback called for failed pushed references | Pierre-Olivier Latour | 2015-03-11 | 1 | -13/+14 | |
* | | | | | | Merge remote-tracking branch 'ethomson/submodule_8dot3' | Carlos Martín Nieto | 2015-03-18 | 4 | -61/+275 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | repository: Introduce "reserved names" | Edward Thomson | 2015-02-27 | 4 | -61/+274 | |
* | | | | | | | Merge pull request #2985 from claudiuolteanu/patch-1 | Edward Thomson | 2015-03-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Lower case the include directive of windows header | Claudiu Olteanu | 2015-03-16 | 1 | -1/+1 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2983 from jeffhostetler/jeffhostetler/perf_merge_lazy_bin... | Edward Thomson | 2015-03-17 | 2 | -9/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | PERF: In MERGE, lazily compute is_binary | Jeff Hostetler | 2015-03-16 | 2 | -9/+19 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #2991 from sba1/fix-uninitialized-data-access-remote-updat... | Edward Thomson | 2015-03-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Initialize refs vector in git_remote_update_tips(). | Sebastian Bauer | 2015-03-17 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2962 from libgit2/cmn/reflog-annotated | Edward Thomson | 2015-03-17 | 14 | -27/+247 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | CHANGELOG: add notes about the annotated ref-modifying functionscmn/reflog-annotated | Carlos Martín Nieto | 2015-03-16 | 1 | -1/+14 | |
| * | | | | | | Add tests for the annotated versions of ref-modifying functions | Carlos Martín Nieto | 2015-03-16 | 5 | -16/+66 | |
| * | | | | | | annotated_commit: provide a constructor from a revspec | Carlos Martín Nieto | 2015-03-16 | 2 | -0/+45 | |
| * | | | | | | Add annotated commit versions of reflog-modifying functions | Carlos Martín Nieto | 2015-03-16 | 6 | -10/+122 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #2972 from libgit2/cmn/pack-objects-walk | Edward Thomson | 2015-03-17 | 10 | -37/+288 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | local: let the packbuilder perform smarter object insertioncmn/pack-objects-walk | Carlos Martín Nieto | 2015-03-11 | 1 | -32/+10 | |
| * | | | | | | pack-objects: fill a packbuilder from a walk | Carlos Martín Nieto | 2015-03-11 | 3 | -1/+265 | |
| * | | | | | | Reorder some khash declarations | Carlos Martín Nieto | 2015-03-11 | 7 | -4/+13 | |
* | | | | | | | Merge pull request #2982 from libgit2/cmn/stream-check-ec | Edward Thomson | 2015-03-17 | 3 | -1/+14 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | http: do not try to use the cert callback on unencrypted streamscmn/stream-check-ec | Carlos Martín Nieto | 2015-03-16 | 2 | -1/+7 | |
| * | | | | | | | Add failing test for cert callback with non-ecrypted stream | Carlos Martín Nieto | 2015-03-16 | 1 | -0/+7 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #2977 from pks-t/submodule-sync-url-fix | Edward Thomson | 2015-03-17 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix git_submodule_sync writing URL to wrong key. | Patrick Steinhardt | 2015-03-12 | 2 | -5/+5 |