| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Revert pull request #1997revert-1997 | Vicent Marti | 2014-03-06 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #1997 from mgbowen/merge-options-init-fix | Vicent Marti | 2014-03-06 | 1 | -1/+1 |
| |\ | | | | | Fix GIT_MERGE_OPTS_INIT on MSVC. | ||||
| | * | Fix GIT_MERGE_OPTS_INIT on MSVC. | Matthew Bowen | 2013-12-09 | 1 | -1/+1 |
| | | | |||||
| * | | Added function-based initializers for every options struct. | Matthew Bowen | 2014-03-05 | 1 | -0/+24 |
| | | | | | | | | | The basic structure of each function is courtesy of arrbee. | ||||
| * | | Improve documentation for merging | Edward Thomson | 2014-02-21 | 1 | -33/+127 |
| | | | |||||
| * | | merge: rename _oid() -> id() | Carlos Martín Nieto | 2014-01-25 | 1 | -4/+4 |
| | | | | | | | | | Following the rest of the series, use 'id' when refering to the value. | ||||
| * | | Support union merges | Edward Thomson | 2014-01-20 | 1 | -0/+3 |
| | | | |||||
| * | | Remove the "merge none" flag | Edward Thomson | 2014-01-20 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed. | ||||
| * | | merge_file should use more aggressive levels | Edward Thomson | 2014-01-20 | 1 | -7/+14 |
| |/ | | | | | | | | | | | The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem. | ||||
| * | Bare naked merge and rebase | Edward Thomson | 2013-12-03 | 1 | -0/+20 |
| | | |||||
| * | merge branch into current, updating workdir | Edward Thomson | 2013-11-05 | 1 | -0/+60 |
| | | |||||
| * | merge: reverse array and length parameter order | Carlos Martín Nieto | 2013-09-22 | 1 | -3/+3 |
| | | | | | Make it pair up with the one for commits. This fixes #1691. | ||||
| * | fixes issues with objective-git | John Josef | 2013-09-08 | 1 | -5/+5 |
| | | |||||
| * | Fixed most documentation header bugs | Andreas Linde | 2013-06-24 | 1 | -1/+1 |
| | | | | | | | | | | | | Fixed a few header @param and @return typos with the help of -Wdocumentation in Xcode. The following warnings have not been fixed: common.h:213 - Not sure how the documentation format is for '...' notes.h:102 - Correct @param name but empty text notes.h:111 - Correct @param name but empty text pack.h:140 - @return missing text pack.h:148 - @return missing text | ||||
| * | Fix two typos in the merge docs. | Arthur Schreiber | 2013-05-29 | 1 | -2/+2 |
| | | |||||
| * | merge setup | Edward Thomson | 2013-05-17 | 1 | -4/+55 |
| | | |||||
| * | Fix trailing whitespaces | nulltoken | 2013-05-15 | 1 | -4/+4 |
| | | |||||
| * | Unify whitespaces to tabs | Linquize | 2013-05-15 | 1 | -1/+1 |
| | | |||||
| * | renames! | Edward Thomson | 2013-04-30 | 1 | -0/+13 |
| | | |||||
| * | merge! | Edward Thomson | 2013-04-30 | 1 | -5/+59 |
| | | |||||
| * | update copyrights | Edward Thomson | 2013-01-08 | 1 | -1/+1 |
| | | |||||
| * | Format/documentation tweaks for merge.h | Ben Straub | 2012-11-27 | 1 | -2/+12 |
| | | |||||
| * | git_mergebase: Constness-Fix for consistency | Sascha Cunz | 2012-09-09 | 1 | -1/+1 |
| | | |||||
| * | merge: Expose git_merge_base_many() | nulltoken | 2012-06-07 | 1 | -0/+10 |
| | | |||||
| * | Move git_merge_base() to is own header and document it | Carlos Martín Nieto | 2012-04-12 | 1 | -0/+35 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |