5 Commits

Author	SHA1	Message	Date
Edward Thomson	93a7004cc2	git_rebase_commit: drop already-picked commits ... Already cherry-picked commits should not be re-included. If all changes included in a commit exist in the upstream, then we should error with GIT_EAPPLIED.	2014-10-26 22:59:21 -04:00
Edward Thomson	a35a9890b0	Introduce git_rebase_commit ... Commit the current patch of a rebase process.	2014-10-26 22:59:19 -04:00
Edward Thomson	950a709159	Introduce git_rebase_next ... `git_rebase_next` will apply the next patch (or cherry-pick) operation, leaving the results checked out in the index / working directory so that consumers can resolve any conflicts, as appropriate.	2014-10-26 22:59:14 -04:00
Edward Thomson	4fe84d624b	Introduce git_rebase_abort ... Abort an in-progress rebase and move the working directory and repository back to the ORIG_HEAD state.	2014-10-26 22:59:12 -04:00
Edward Thomson	867a36f3a6	Introduce git_rebase to set up a rebase session ... Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.	2014-10-26 22:59:08 -04:00