summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wipcmn/ref-txnCarlos Martín Nieto2013-12-183-0/+51
* Merge pull request #2000 from ethomson/overwrite_ignoredVicent Marti2013-12-133-8/+132
|\
| * Overwrite ignored directories on checkoutEdward Thomson2013-12-132-9/+45
| * Overwrite ignored files on checkoutEdward Thomson2013-12-133-6/+94
|/
* Merge pull request #1986 from libgit2/rb/error-handling-cleanupsVicent Marti2013-12-13109-1637/+2325
|\
| * pool: Agh, this test doesn't really apply in 32-bit machinesVicent Marti2013-12-131-3/+0
| * pool: Correct overflow checksVicent Marti2013-12-132-1/+8
| * pool: Cleanup error handling in pool_strdupVicent Marti2013-12-131-15/+4
| * Add git_treebuilder_insert test and clarify docRussell Belfer2013-12-122-17/+78
| * Cleanups, renames, and leak fixesRussell Belfer2013-12-1217-21/+29
| * More tests of canceling from callbacksRussell Belfer2013-12-123-43/+186
| * Fix up some valgrind leaks and warningsRussell Belfer2013-12-114-18/+28
| * Test cancel from indexer progress callbackRussell Belfer2013-12-1110-88/+95
| * More improvements to callback return value testsRussell Belfer2013-12-112-32/+132
| * Try a test that won't assert on LinuxRussell Belfer2013-12-111-2/+2
| * Update clone doc and tests for callback return valRussell Belfer2013-12-113-26/+91
| * Fix checkout notify callback docs and testsRussell Belfer2013-12-113-10/+93
| * Update git_blob_create_fromchunks callback behavrRussell Belfer2013-12-113-38/+78
| * Update docs for new callback return value behaviorRussell Belfer2013-12-1113-58/+91
| * One more rename/cleanup for callback err functionsRussell Belfer2013-12-1124-49/+71
| * Further callback error check style fixesRussell Belfer2013-12-113-19/+36
| * Some callback error check style cleanupsRussell Belfer2013-12-1112-30/+54
| * Fix C99 __func__ for MSVCRussell Belfer2013-12-111-0/+4
| * Remove converting user error to GIT_EUSERRussell Belfer2013-12-1157-804/+603
| * Add git_vector_free_allRussell Belfer2013-12-1113-84/+33
| * Further EUSER and error propagation fixesRussell Belfer2013-12-1121-192/+273
| * Improve GIT_EUSER handlingRussell Belfer2013-12-1128-383/+624
| * Add config read fns with controlled error behaviorRussell Belfer2013-12-1115-259/+267
* | Merge pull request #2001 from ethomson/merge_version_validateRussell Belfer2013-12-122-0/+6
|\ \ | |/ |/|
| * Validate struct versions in merge, revertEdward Thomson2013-12-122-0/+6
|/
* Merge pull request #1985 from libgit2/diff-rename-configRussell Belfer2013-12-113-11/+213
|\
| * Check version earlierBen Straub2013-12-111-1/+2
| * Clarify docsBen Straub2013-12-061-3/+3
| * Don't clobber whitespace settingsBen Straub2013-12-062-5/+47
| * Clarify default value and behaviorBen Straub2013-12-061-1/+5
| * Don't use weird return codesBen Straub2013-12-052-3/+11
| * Implement GIT_DIFF_FIND_BY_CONFIGBen Straub2013-12-052-11/+155
| * Introduce GIT_DIFF_FIND_BY_CONFIGBen Straub2013-12-051-0/+3
* | Merge pull request #1996 from ethomson/warningsVicent Marti2013-12-0910-41/+32
|\ \
| * | Clean up warningsEdward Thomson2013-12-0910-41/+32
|/ /
* | Merge pull request #1994 from palistov/commit-cleanupEdward Thomson2013-12-081-1/+3
|\ \
| * | commit: Fix potential segfault in git_commit_messagePaul Holden2013-12-081-1/+3
* | | Merge pull request #1993 from jaredlwong/developmentVicent Marti2013-12-081-1/+1
|\ \ \ | |/ / |/| |
| * | Fixed left shift size of int.Jared Wong2013-12-081-1/+1
|/ /
* | Merge pull request #1989 from palistov/blame-cleanupVicent Martí2013-12-061-2/+0
|\ \
| * | blame.c: Remove unnecessary error-check and gotoPaul Holden2013-12-051-2/+0
|/ /
* | Merge pull request #1988 from mgbowen/fix-libssh2-windowsVicent Martí2013-12-051-5/+2
|\ \ | |/ |/|
| * Fixed compilation on Windows when using libssh2.mgbowen2013-12-051-5/+2
|/
* Merge pull request #1984 from ethomson/revert_fixEdward Thomson2013-12-031-13/+13
|\
| * Reorder var decls in revert testEdward Thomson2013-12-031-13/+13
|/