Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #2337 from ethomson/merge_ff | Vicent Marti | 2014-05-28 | 3 | -34/+125 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE | Edward Thomson | 2014-05-27 | 3 | -31/+32 | |
| * | | | | Staticify `merge_config` | Edward Thomson | 2014-05-27 | 1 | -1/+1 | |
| * | | | | Use a config snapshot | Edward Thomson | 2014-05-27 | 1 | -1/+1 | |
| * | | | | Move GIT_MERGE_CONFIG_* to its own enum | Edward Thomson | 2014-05-27 | 3 | -43/+61 | |
| * | | | | Introduce GIT_MERGE_CONFIG_* for merge.ff settings | Edward Thomson | 2014-05-27 | 3 | -9/+81 | |
|/ / / / | ||||||
* | | | | Merge pull request #2382 from mikeando/doc_fixes | Carlos Martín Nieto | 2014-05-26 | 10 | -34/+31 | |
|\ \ \ \ | ||||||
| * | | | | Fixed miscellaneous documentation errors. | Michael Anderson | 2014-05-23 | 10 | -34/+31 | |
|/ / / / | ||||||
* | | | | odb: clear backend errors on successful read | Carlos Martín Nieto | 2014-05-23 | 1 | -0/+1 | |
| |_|/ |/| | | ||||||
* | | | smart: initialize the error variable | Carlos Martín Nieto | 2014-05-22 | 1 | -1/+1 | |
* | | | Plug leaks and fix a C99-ism | Carlos Martín Nieto | 2014-05-22 | 3 | -13/+16 | |
* | | | Merge pull request #2376 from libgit2/cmn/remote-symref | Vicent Marti | 2014-05-22 | 11 | -98/+284 | |
|\ \ \ | ||||||
| * | | | clone: get rid of head_infocmn/remote-symref | Carlos Martín Nieto | 2014-05-21 | 1 | -23/+12 | |
| * | | | clone: make use of the remote's default branch guessing | Carlos Martín Nieto | 2014-05-21 | 1 | -67/+17 | |
| * | | | remote: add api to guess the remote's default branch | Carlos Martín Nieto | 2014-05-21 | 3 | -0/+115 | |
| * | | | local transport: expose the symref data | Carlos Martín Nieto | 2014-05-21 | 1 | -4/+18 | |
| * | | | remote: expose the remote's symref mappings | Carlos Martín Nieto | 2014-05-21 | 4 | -0/+43 | |
| * | | | smart: store reported symrefs | Carlos Martín Nieto | 2014-05-21 | 3 | -7/+82 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2375 from libgit2/rb/safecrlf-on-lf-platform | Vicent Marti | 2014-05-22 | 3 | -3/+25 | |
|\ \ \ | ||||||
| * | | | Just don't CRLF filter if there are no CRsrb/safecrlf-on-lf-platform | Russell Belfer | 2014-05-19 | 1 | -3/+5 | |
| * | | | Make core.safecrlf work on LF-ending platforms | Russell Belfer | 2014-05-19 | 3 | -4/+24 | |
* | | | | Merge pull request #2379 from ethomson/status_win32 | Vicent Marti | 2014-05-22 | 1 | -2/+3 | |
|\ \ \ \ | ||||||
| * | | | | Include windows.h on win32 for Sleep | Edward Thomson | 2014-05-21 | 1 | -2/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #2372 from libgit2/cmn/fetch-terminate | Vicent Marti | 2014-05-21 | 1 | -0/+12 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | smart: send a flush when we disconnectcmn/fetch-terminate | Carlos Martín Nieto | 2014-05-20 | 1 | -0/+12 | |
| |/ / | ||||||
* | | | Merge pull request #2373 from kitbellew/fix-clone-into-mirror | Carlos Martín Nieto | 2014-05-21 | 1 | -4/+2 | |
|\ \ \ | ||||||
| * | | | Minor fix for cmn/clone-into-mirror. | Albert Meltzer | 2014-05-20 | 1 | -4/+2 | |
|/ / / | ||||||
* | | | Fix a leak in the tests | Carlos Martín Nieto | 2014-05-20 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #2371 from martinwoodward/attrib_fnmatch | Vicent Marti | 2014-05-19 | 2 | -3/+58 | |
|\ \ | ||||||
| * | | Restore attributions for fnmatch | Martin Woodward | 2014-05-19 | 2 | -3/+58 | |
* | | | Merge pull request #2354 from libgit2/cmn/clone-into-mirror | Vicent Marti | 2014-05-19 | 3 | -15/+75 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | clone: don't error out if the branch already existscmn/clone-into-mirror | Carlos Martín Nieto | 2014-05-19 | 1 | -0/+4 | |
| * | | clone: duplicate the remote | Carlos Martín Nieto | 2014-05-19 | 1 | -15/+12 | |
| * | | clone: add failing test for a mirror-clone with clone_into | Carlos Martín Nieto | 2014-05-19 | 2 | -0/+59 | |
* | | | Merge pull request #2364 from libgit2/cmn/comment-char | Vicent Marti | 2014-05-19 | 4 | -13/+15 | |
|\ \ \ | ||||||
| * | | | message: don't assume the comment charcmn/comment-char | Carlos Martín Nieto | 2014-05-18 | 4 | -13/+15 | |
* | | | | Merge pull request #2303 from jacquesg/mingw-lseek | Vicent Marti | 2014-05-19 | 3 | -2/+3 | |
|\ \ \ \ | ||||||
| * | | | | git_pool_mallocsz takes an unsigned long | Jacques Germishuys | 2014-05-01 | 1 | -1/+1 | |
| * | | | | _InterlockedExchange expects a volatile LONG | Jacques Germishuys | 2014-05-01 | 1 | -1/+1 | |
| * | | | | Undef lseek first | Jacques Germishuys | 2014-05-01 | 1 | -0/+1 | |
* | | | | | Merge pull request #2365 from kitbellew/fix-indexer-mmap | Philip Kelley | 2014-05-18 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Fix warning on uninitialized variable. | Albert Meltzer | 2014-05-18 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Fix a bug in the pack::packbuilder suite | Philip Kelley | 2014-05-17 | 1 | -0/+2 | |
* | | | | Fix printf format string from previous commit | Philip Kelley | 2014-05-17 | 1 | -1/+1 | |
* | | | | print_binary_hunk: Treat types with respect | Philip Kelley | 2014-05-17 | 1 | -7/+24 | |
* | | | | Merge remote-tracking branch 'upstream/cmn/indexer-mmap' into development | Philip Kelley | 2014-05-17 | 8 | -73/+111 | |
|\ \ \ \ | ||||||
| * | | | | indexer: mmap fixes for Windowscmn/indexer-mmap | Carlos Martín Nieto | 2014-05-17 | 4 | -3/+11 | |
| * | | | | indexer: use mmap for writing | Carlos Martín Nieto | 2014-05-17 | 6 | -72/+102 | |
* | | | | | Merge pull request #2362 from libgit2/rb/update-4k-to-8k | Vicent Marti | 2014-05-17 | 4 | -2/+125 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Git binary check compat testsrb/update-4k-to-8k | Russell Belfer | 2014-05-16 | 1 | -0/+114 |