summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update submodules with parent-tracked contentrb/fix-submodules-with-tracked-contentRussell Belfer2014-04-082-4/+101
* graph: handle not finding a merge base gracefullyCarlos Martín Nieto2014-04-081-1/+6
* Merge pull request #2256 from jacquesg/graph-descendantVicent Marti2014-04-082-1/+9
|\
| * Added a no path test for git_graph_descendant_ofJacques Germishuys2014-04-081-0/+8
| * Correct grouping of parenthesesJacques Germishuys2014-04-081-1/+1
* | Merge pull request #2255 from libgit2/rb/fix-multiple-nfd-iconv-bugVicent Marti2014-04-072-1/+13
|\ \ | |/ |/|
| * vmg is always rightRussell Belfer2014-04-071-1/+1
| * Fix bug with multiple iconv conversions in one dirRussell Belfer2014-04-072-1/+13
|/
* Merge pull request #2249 from libgit2/rb/starstar-fnmatchVicent Marti2014-04-073-9/+77
|\
| * Fix fnmatch comment to be clearerrb/starstar-fnmatchRussell Belfer2014-04-061-1/+3
| * More ** tests for pattern rulesRussell Belfer2014-04-062-6/+54
| * Add support for ** matches in ignoresRussell Belfer2014-04-042-3/+21
* | Merge pull request #2250 from jacquesg/vector-leakVicent Marti2014-04-061-2/+4
|\ \ | |/ |/|
| * Don't lose our elements when calling git_vector_set()Jacques Germishuys2014-04-061-2/+4
* | Merge pull request #2215 from libgit2/rb/submodule-cache-fixesVicent Marti2014-04-0424-517/+1203
|\ \
| * | Test (and fix) the git_submodule_sync changesRussell Belfer2014-04-032-11/+38
| * | Minor code cleanupRussell Belfer2014-04-032-108/+79
| * | git_submodule_resolve_url supports relative urlsJan Melcher2014-04-033-126/+198
| * | Test git_submodule_add_setup with relative urlJan Melcher2014-04-031-0/+24
| * | More tests and fix submodule index refreshRussell Belfer2014-04-014-14/+132
| * | Remove most submodule reloads from testsRussell Belfer2014-04-013-34/+55
| * | Fix submodule accounting for name and path changesRussell Belfer2014-04-012-10/+107
| * | Minor submodule cache locking improvementsRussell Belfer2014-04-012-15/+45
| * | Reinstate efficient submodule reloadingRussell Belfer2014-04-011-123/+111
| * | Use enums instead of bools for submodule optionsRussell Belfer2014-04-011-20/+37
| * | Make submodule refresh a bit smarterRussell Belfer2014-04-015-64/+115
| * | Make a real submodule cache objectRussell Belfer2014-04-014-142/+243
| * | Add some funny options for debugging statusRussell Belfer2014-04-011-9/+50
| * | Submodule sync refactoringRussell Belfer2014-04-012-47/+49
| * | Fix git_submodule_sync and add new config helperRussell Belfer2014-04-014-113/+149
| * | Add efficient git_buf join3 APIRussell Belfer2014-04-015-5/+95
* | | Merge pull request #2211 from Yogu/retry-renaming-configVicent Marti2014-04-041-1/+22
|\ \ \ | |_|/ |/| |
| * | Retry renaming files on Access Denied errorsJan Melcher2014-03-271-1/+22
* | | Merge pull request #2244 from jacquesg/const-correctnessVicent Marti2014-04-0312-24/+31
|\ \ \
| * | | Const correctness!Jacques Germishuys2014-04-0312-24/+31
|/ / /
* | | Merge pull request #2238 from libgit2/cmn/upstream-for-unbornVicent Marti2014-04-034-8/+90
|\ \ \
| * | | remote: mark branch for-merge even if we're unbornCarlos Martín Nieto2014-04-021-7/+20
| * | | remote: write tests for cloning from an empty repoCarlos Martín Nieto2014-04-023-1/+70
* | | | Merge pull request #2239 from libgit2/vmg/clar-skip-testVicent Marti2014-04-036-69/+89
|\ \ \ \ | |/ / / |/| | |
| * | | Clar: skip testsvmg/clar-skip-testVicent Marti2014-04-026-73/+89
| * | | Add warning when skipping blame testRussell Belfer2014-04-021-12/+7
| * | | Skip blame libgit2 test if not in libgit2 repoRussell Belfer2014-04-011-2/+11
* | | | Merge pull request #2237 from mekishizufu/fix_return_valueVicent Marti2014-04-021-1/+1
|\ \ \ \
| * | | | checkout: Fix submodule_is_config_only's return valueJiri Pospisil2014-04-021-1/+1
* | | | | Merge pull request #2230 from anuraggup/revwalk-merge-baseVicent Marti2014-04-023-41/+93
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | No need to find merge base.Anurag Gupta2014-03-313-41/+93
* | | | | Merge pull request #2231 from libgit2/fix-memory-index-doc-commentVicent Marti2014-04-021-2/+2
|\ \ \ \ \
| * | | | | Give the correct name for the function in the doc.fix-memory-index-doc-commentRob Rix2014-04-021-2/+2
| * | | | | Correct a stale reference to GIT_EBAREINDEXRob Rix2014-04-011-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #2233 from libgit2/rb/fix-untracked-repo-statusVicent Marti2014-04-023-25/+186
|\ \ \ \ \ | |/ / / / |/| | | |
View Lorry Controller Status