delta/libgit2.git/tests/revert, branch ethomson/refresh_objects

merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`

2015-11-25T20:37:05+00:00

revert: correct test that added trailing newline

2015-07-07T22:01:49+00:00

Renamed git_merge_options 'flags' to 'tree_flags'

2015-03-16T07:53:27+00:00

reset: remove reflog message override

2015-03-03T13:40:50+00:00

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

2015-03-03T13:40:50+00:00

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

2014-10-27T21:27:25+00:00

Allow to propagate checkout callbacks to git HARD reset

2014-08-03T14:29:51+00:00

Signed-off-by: Sven Strickroth

Capture conflict information in MERGE_MSG for revert and merge

2014-04-14T14:16:22+00:00

Update git_merge_tree_opts to git_merge_options

2014-03-20T16:25:08+00:00

git_revert_opts -> git_revert_options

2014-03-06T17:44:52+00:00