Fix Rebase issues - #568

Merged

tbranyen merged 14 commits into

nodegit:masterfrom

jdgarcia:fix-rebase

May 15, 2015

Commits on May 14, 2015

fix annotated_commit in libgit2-supplement.json
jdgarcia
committed
10e0ffc
add git_rebase_next to libgit2-supplement.json
jdgarcia
committed
d0ce712
test: clean rebase ff
jdgarcia
committed
7de5087
update descriptor.json for git_rebase_init and git_rebase_commit
jdgarcia
committed
5f88721
test: cleanly rebase one branch onto another branch
jdgarcia
committed
9ee1085
test convenience methods for adding/removing files from the index
jdgarcia
committed
051b3c4
test: rebase with merge conflicts
jdgarcia
committed
a4c1230
ignore git_rebase_free
jdgarcia
committed
889025d
test: abort rebase
jdgarcia
committed
4ed584d
in normalizeOptions, check if options exists before bothering to create 'instance'
jdgarcia
committed
3808db2
in normalizeOptions(), immediately return options if it's an instance of Ctor
jdgarcia
committed
e20f887
git_rebase_finish signature is optional
jdgarcia
committed
da808cb
convenience methods for normalizing opts
jdgarcia
committed
ab50c82
added convenience method: repository.rebaseBranches()
jdgarcia
committed
2ab75df