summaryrefslogtreecommitdiff
path: root/tests/revert/workdir.c
Commit message (Collapse)AuthorAgeFilesLines
* Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-2/+2
|
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-031-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 functionsCarlos Martín Nieto2015-03-031-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 testsEdward Thomson2014-10-271-8/+6
|
* Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-031-14/+14
| | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* Capture conflict information in MERGE_MSG for revert and mergeJacques Germishuys2014-04-141-1/+13
|
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-4/+4
|
* git_revert_opts -> git_revert_optionsoptions-namesBen Straub2014-03-061-6/+6
|
* More merge.conflictstyle fixesBen Straub2014-02-051-0/+7
|
* Add reflog parameters to git_resetBen Straub2014-02-031-14/+14
|
* Remove the "merge none" flagEdward Thomson2014-01-201-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 levelsEdward Thomson2014-01-201-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 testEdward Thomson2013-12-031-13/+13
| | | | Oh, MSVC.
* Bare naked merge and rebaseEdward Thomson2013-12-031-0/+364
View Lorry Controller Status