Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added failing repodiff-fails-with-cpp-file | Brendan Forster | 2015-03-30 | 70 | -0/+3021 |
* | added failing test against demo repository | Brendan Forster | 2015-03-30 | 1 | -0/+31 |
* | Merge pull request #3011 from ethomson/filter_zero_tempbuf | Edward Thomson | 2015-03-25 | 11 | -0/+25 |
|\ | |||||
| * | filter: clear the temp_buf if we're using one | Edward Thomson | 2015-03-25 | 1 | -0/+3 |
| * | Illustrate bad checkout on Windows | Jacques Germishuys | 2015-03-25 | 10 | -0/+22 |
* | | Merge pull request #3017 from ethomson/leaks | Carlos Martín Nieto | 2015-03-25 | 3 | -5/+7 |
|\ \ | |||||
| * | | squash some leaks | Edward Thomson | 2015-03-24 | 3 | -5/+7 |
|/ / | |||||
* | | Merge pull request #2990 from leoyanggit/custom_param | Edward Thomson | 2015-03-24 | 7 | -12/+30 |
|\ \ | |||||
| * | | Add a custom param to git_smart_subtransport_definition | Leo Yang | 2015-03-18 | 7 | -12/+30 |
* | | | Merge pull request #2986 from tkelman/mingw_winhttp | Edward Thomson | 2015-03-24 | 9 | -33/+792 |
|\ \ \ | |||||
| * | | | Use swprintf_s everywhere except mingw.org | Tony Kelman | 2015-03-19 | 2 | -5/+8 |
| * | | | set PKG_CONFIG_LIBDIR in toolchain-mingw32.cmake | Tony Kelman | 2015-03-17 | 1 | -0/+2 |
| * | | | use a different .def file for 64 bit | Tony Kelman | 2015-03-16 | 2 | -2/+37 |
| * | | | Fix out-of-tree build | Tony Kelman | 2015-03-16 | 1 | -4/+6 |
| * | | | 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 |
|/ / / / / / |