summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make git_cred_ssh_custom_new() naming more consistentJacques Germishuys2014-04-183-8/+8
* Introduce git_cred_ssh_interactive_new()Jacques Germishuys2014-04-183-0/+88
* Merge pull request #2274 from libgit2/cmn/ssh-expect-usernameVicent Marti2014-04-182-50/+14
|\
| * cred: tighten username rulesCarlos Martín Nieto2014-04-182-50/+14
|/
* Merge pull request #2108 from libgit2/rb/threadsafe-index-iteratorVicent Marti2014-04-1850-1292/+2303
|\
| * Some memory leak fixesRussell Belfer2014-04-174-30/+38
| * Fix broken logic for attr cache invalidationRussell Belfer2014-04-1713-210/+265
| * Lock attribute file while reparsing dataRussell Belfer2014-04-173-17/+49
| * Fix race checking for existing index itemsRussell Belfer2014-04-172-22/+40
| * Fix tests with new attr cache codeRussell Belfer2014-04-174-57/+109
| * Attribute file cache refactorRussell Belfer2014-04-1718-756/+940
| * Minor tree cache speedupsRussell Belfer2014-04-172-17/+11
| * Fix leak in git_index_conflict_cleanupRussell Belfer2014-04-172-29/+22
| * Fix leak when using push and pop with ignoresRussell Belfer2014-04-171-0/+3
| * Fix refcount issues with mutex protected ignoresRussell Belfer2014-04-171-1/+15
| * Fix threading tests when threads disabledRussell Belfer2014-04-172-11/+12
| * Clean up index snapshot function namingRussell Belfer2014-04-175-54/+63
| * Index locking and entry allocation changesRussell Belfer2014-04-176-202/+309
| * Add diff threading tests and attr file cache locksRussell Belfer2014-04-1713-140/+361
| * Decouple index iterator sort from indexRussell Belfer2014-04-179-107/+142
| * Add mutex around index entries changesRussell Belfer2014-04-172-63/+169
| * Add index snapshot and use it for iteratorRussell Belfer2014-04-173-22/+67
| * Add public diff print helpersRussell Belfer2014-04-173-24/+96
| * Some index internals refactoringRussell Belfer2014-04-175-176/+219
| * Some vector utility tweaksRussell Belfer2014-04-177-33/+52
* | cherry-pick: terminate the commit id stringCarlos Martín Nieto2014-04-181-1/+1
|/
* 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