delta/libgit2.git/tests/rebase/merge.c, branch cmn/https-cap-no-hardcode

git_rebase_init: correctly handle detached HEAD

2016-12-02T04:11:57+00:00

git_rebase_finish relies on head_detached being set, but
rebase_init_merge was only setting it when branch->ref_name was unset.
But branch->ref_name would be set to "HEAD" in the case of detached
HEAD being either implicitly (NULL) or explicitly passed to
git_rebase_init.

rebase: test rebasing a new commit with subfolder

2016-06-02T07:38:18+00:00

Test a rebase (both a merge rebase and an inmemory rebase) with a new
commit that adds files underneath a new subfolder.

rebase: test rebase (merge) w/ no common ancestor

2016-05-03T19:29:44+00:00

rebase: correctly finish rebasing detached heads

2016-04-21T22:19:05+00:00

When rebasing with IDs, we do not return to the `branch`,
we remain in a detached HEAD state.

rebase: additional tests for completing a rebase

2016-02-29T01:10:44+00:00

rebase: allow custom merge_options

2016-02-11T18:49:25+00:00

Allow callers of rebase to specify custom merge options.  This may
allow custom conflict resolution, or failing fast when conflicts
are detected.

Fixed unused warning in tests/rebase/merge.c

2015-04-30T12:17:05+00:00

rebase: include checkout opts within rebase opts

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

rebase: test checkout options for rebase

2015-04-20T20:22:59+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.