summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2261 from jacquesg/format-patchVicent Marti2014-04-16102-6/+1893
|\
| * Added a test case for formatting a binary patch e-mailJacques Germishuys2014-04-151-0/+43
| * Sanitize git_diff_format_email_options' summary parameterJacques Germishuys2014-04-152-1/+87
| * Introduce git_diff_format_email and git_diff_commit_as_emailJacques Germishuys2014-04-154-0/+740
| * Introduce git_diff_get_stats, git_diff_stats_files_changed, git_diff_stats_in...Jacques Germishuys2014-04-153-0/+856
| * Added git_diff_stats test filesJacques Germishuys2014-04-1589-0/+72
| * Fix const-correctness of git_patch_get_delta, git_patch_num_hunks, git_patch_...Jacques Germishuys2014-04-112-6/+6
| * Added RFC2822 date format test casesJacques Germishuys2014-04-111-0/+40
| * Introduce git__date_rfc2822_fmt. Allows for RFC2822 date headersJacques Germishuys2014-04-112-0/+40
| * Introduce git_buf_putcnJacques Germishuys2014-04-102-0/+10
* | Merge pull request #2270 from csware/fix_git_branch_t_enumVicent Marti2014-04-163-3/+4
|\ \
| * | Add GIT_BRANCH_ALL to git_branch_t enumSven Strickroth2014-04-163-3/+4
|/ /
* | Merge pull request #2269 from libgit2/rb/fix-leading-slash-ignoresVicent Marti2014-04-166-30/+101
|\ \
| * | Fix core.excludesfile named .gitignorerb/fix-leading-slash-ignoresRussell Belfer2014-04-146-30/+101
* | | Merge pull request #2235 from jacquesg/cherry-pickVicent Marti2014-04-15102-2/+1019
|\ \ \ | |/ / |/| |
| * | Capture conflict information in MERGE_MSG for revert and mergeJacques Germishuys2014-04-144-2/+24
| * | Added cherry pick testsJacques Germishuys2014-04-1492-0/+631
| * | Added cherry-pick supportJacques Germishuys2014-04-144-0/+320
| * | Introduce git_merge__extract_conflict_pathsJacques Germishuys2014-04-142-0/+43
| * | Update AUTHORSJacques Germishuys2014-04-071-0/+1
* | | Merge pull request #2264 from jacquesg/fix-warningsVicent Marti2014-04-142-3/+5
|\ \ \
| * | | Correct C90 warningsJacques Germishuys2014-04-112-3/+5
| | |/ | |/|
* | | Merge pull request #2262 from libgit2/rb/fix-ignore-popVicent Marti2014-04-143-31/+92
|\ \ \ | |/ / |/| |
| * | Fix bug popping ignore files during wd iterationRussell Belfer2014-04-103-31/+92
* | | Merge pull request #2259 from libgit2/vmg/state-cleanupVicent Marti2014-04-092-12/+41
|\ \ \
| * | | Rewrite `git_repository__cleanup_files`vmg/state-cleanupVicent Marti2014-04-091-14/+20
| * | | git_repository_state_cleanup() should remove rebase-merge/, rebase-apply/ and...Jacques Germishuys2014-04-072-1/+24
| | |/ | |/|
* | | Merge pull request #2257 from libgit2/rb/fix-submodules-with-tracked-contentVicent Marti2014-04-092-4/+101
|\ \ \
| * | | Update submodules with parent-tracked contentrb/fix-submodules-with-tracked-contentRussell Belfer2014-04-082-4/+101
| | |/ | |/|
* | | Merge pull request #2258 from libgit2/jk/userdiff-ccVicent Marti2014-04-091-9/+7
|\ \ \ | |/ / |/| |
| * | userdiff: update ada patternsjk/userdiff-ccJeff King2014-04-081-2/+2
| * | userdiff: update C/C++ patternsJeff King2014-04-081-7/+5
|/ /
* | 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
View Lorry Controller Status