summaryrefslogtreecommitdiff
path: root/tests/resources/rebase
Commit message (Collapse)AuthorAgeFilesLines
* git_rebase_commit: drop already-picked commitsEdward Thomson2014-10-2610-0/+5
| | | | | | 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.
* Introduce git_rebase to set up a rebase sessionEdward Thomson2014-10-26124-0/+167
Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.