Jacques Germishuys
f29dde6828
Renamed git_merge_options 'flags' to 'tree_flags'
2015-03-16 09:53:27 +02:00
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
Carlos Martín Nieto
659cf2029f
Remove the signature from ref-modifying functions
...
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.
2015-03-03 14:40:50 +01:00
Carlos Martín Nieto
942a7b39ed
Fix test build
...
Some PRs have fallen out of sync with the changes in signatures, so we
need to take a few extra parameters into account.
2014-10-10 18:03:09 +02:00
Carlos Martín Nieto
0625638f06
Merge pull request #2499 from csware/hard-reset-checkout-callbacks
...
Allow to propagate checkout callbacks to git HARD reset
2014-10-10 17:40:53 +02:00
Jacques Germishuys
493c340cef
Added test case to illustrate bogus conflicts detected if no files were merged, and untracked files exist in the workdir.
2014-09-12 22:01:22 +02:00
Sven Strickroth
b8add6c42e
Allow to propagate checkout callbacks to git HARD reset
...
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2014-08-03 16:29:51 +02:00
Edward Thomson
0ba4dca526
git_cherry_pick -> git_cherrypick
2014-07-22 10:40:23 -04:00
Jacques Germishuys
103b7d2122
Added cherry pick tests
2014-04-14 16:16:22 +02:00
