| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t` | Edward Thomson | 2015-11-25 | 1 | -2/+2 |
| | | |||||
| * | revert: correct test that added trailing newline | Edward Thomson | 2015-07-07 | 1 | -10/+12 |
| | | |||||
| * | Renamed git_merge_options 'flags' to 'tree_flags' | Jacques Germishuys | 2015-03-16 | 1 | -2/+2 |
| | | |||||
| * | reset: remove reflog message override | Carlos Martín Nieto | 2015-03-03 | 1 | -14/+14 |
| | | | | | | This function is meant to simulate what git does in the reset command, so we should include the reflog message in that. | ||||
| * | Remove the signature from ref-modifying functions | Carlos Martín Nieto | 2015-03-03 | 1 | -14/+14 |
| | | | | | | | | | | | The signature for the reflog is not something which changes dynamically. Almost all uses will be NULL, since we want for the repository's default identity to be used, making it noise. In order to allow for changing the identity, we instead provide git_repository_set_ident() and git_repository_ident() which allow a user to override the choice of signature. | ||||
| * | revert tests: always use core.autocrlf=false in tests | Edward Thomson | 2014-10-27 | 1 | -8/+6 |
| | | |||||
| * | Allow to propagate checkout callbacks to git HARD reset | Sven Strickroth | 2014-08-03 | 1 | -14/+14 |
| | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de> | ||||
| * | Capture conflict information in MERGE_MSG for revert and merge | Jacques Germishuys | 2014-04-14 | 1 | -1/+13 |
| | | |||||
| * | Update git_merge_tree_opts to git_merge_options | Edward Thomson | 2014-03-20 | 1 | -4/+4 |
| | | |||||
| * | git_revert_opts -> git_revert_optionsoptions-names | Ben Straub | 2014-03-06 | 1 | -6/+6 |
| | | |||||
| * | More merge.conflictstyle fixes | Ben Straub | 2014-02-05 | 1 | -0/+7 |
| | | |||||
| * | Add reflog parameters to git_reset | Ben Straub | 2014-02-03 | 1 | -14/+14 |
| | | |||||
| * | Remove the "merge none" flag | Edward Thomson | 2014-01-20 | 1 | -6/+3 |
| | | | | | | | | 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 | -1/+198 |
| | | | | | | | | | | | | 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. | ||||
| * | Reorder var decls in revert test | Edward Thomson | 2013-12-03 | 1 | -13/+13 |
| | | | | | Oh, MSVC. | ||||
| * | Bare naked merge and rebase | Edward Thomson | 2013-12-03 | 2 | -13/+120 |
| | | |||||
| * | Introduce git_revert to revert a single commit | Edward Thomson | 2013-12-02 | 1 | -0/+364 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |