9 Commits

Author	SHA1	Message	Date
Edward Thomson	18b439b9be	git_rebase_next: provide info about the operation	2014-10-26 22:59:34 -04:00
Edward Thomson	5ae9d296e3	git_rebase_finish: rewrite notes when finishing rebase	2014-10-26 22:59:32 -04:00
Edward Thomson	a612a25fa6	git_rebase_commit: write HEAD's reflog appropriately	2014-10-26 22:59:27 -04:00
Edward Thomson	517644cce4	Introduce git_rebase_finish to complete a rebase	2014-10-26 22:59:25 -04:00
Edward Thomson	14864fbfeb	git_rebase_next: test that we return GIT_ITEROVER	2014-10-26 22:59:23 -04:00
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	443d5674fe	git_rebase_next: write conflicts nicely during rebase	2014-10-26 22:59:16 -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