libgit2/tests/merge/workdir
Carlos Martín Nieto 23a17803b6 reset: remove reflog message override
This function is meant to simulate what git does in the reset command,
so we should include the reflog message in that.
2015-03-03 14:40:50 +01:00
..
analysis.c s/git_merge_head/git_annotated_commit 2014-10-26 22:59:48 -04:00
dirty.c reset: remove reflog message override 2015-03-03 14:40:50 +01:00
renames.c Remove git_merge_result as it's now unnecessary 2014-03-20 09:25:09 -07:00
setup.c merge: lock the index at the start of the merge 2015-02-14 09:25:35 -05:00
simple.c reset: remove reflog message override 2015-03-03 14:40:50 +01:00
submodules.c reset: remove reflog message override 2015-03-03 14:40:50 +01:00
trivial.c Remove the signature from ref-modifying functions 2015-03-03 14:40:50 +01:00