delta/libgit2.git/tests/cherrypick, branch cmn/commit-to-memory

merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`

2015-11-25T20:37:05+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.

Fix test build

2014-10-10T16:03:09+00:00

Some PRs have fallen out of sync with the changes in signatures, so we
need to take a few extra parameters into account.

Merge pull request #2499 from csware/hard-reset-checkout-callbacks

2014-10-10T15:40:53+00:00

Allow to propagate checkout callbacks to git HARD reset

Added test case to illustrate bogus conflicts detected if no files were merged, and untracked files exist in the workdir.

2014-09-12T20:01:22+00:00

Allow to propagate checkout callbacks to git HARD reset

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

Signed-off-by: Sven Strickroth

git_cherry_pick -> git_cherrypick

2014-07-22T14:40:23+00:00

Added cherry pick tests

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