delta/libgit2.git/src/rebase.c, branch cmn/clone-submodule

rebase: include checkout opts within rebase opts

2015-04-20T21:19:08+00:00

rebase: init and open take a rebase_options

2015-04-20T20:22:54+00:00

`git_rebase_init` and `git_rebase_open` should take a
`git_rebase_options` and use it for future rebase operations on
that `rebase` object.

rebase: take `checkout_options` where appropriate

2015-04-20T20:22:49+00:00

rebase: block rebase_commit with unstaged changes

2015-04-20T20:22:39+00:00

rebase: identify a rebase that has not started

2015-04-20T20:22:27+00:00

In `git_rebase_operation_current()`, indicate when a rebase has not
started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that
with the first operation being in-progress.

Plug a few leaks

2015-03-03T23:29:37+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.

rebase: check alloc result

2015-02-27T04:39:54+00:00

Merge pull request #2831 from ethomson/merge_lock

2015-02-15T04:18:01+00:00

merge: lock index during the merge (not just checkout)