summaryrefslogtreecommitdiff
path: root/include/git2/rebase.h
Commit message (Collapse)AuthorAgeFilesLines
* rebase: updates based on PR commentsEdward Thomson2014-10-261-17/+15
|
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-3/+4
| | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
* rebase: oid member of operation should be constEdward Thomson2014-10-261-1/+1
|
* git_rebase: iterators for operationsEdward Thomson2014-10-261-0/+27
|
* rebase: preload all operationsEdward Thomson2014-10-261-2/+2
|
* rebase: init/open a git_rebase objectEdward Thomson2014-10-261-11/+32
|
* git_rebase_next: provide info about the operationEdward Thomson2014-10-261-6/+68
|
* git_rebase_finish: rewrite notes when finishing rebaseEdward Thomson2014-10-261-1/+12
|
* Introduce git_rebase_finish to complete a rebaseEdward Thomson2014-10-261-0/+12
|
* git_rebase_commit: drop already-picked commitsEdward Thomson2014-10-261-1/+3
| | | | | | 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_commitEdward Thomson2014-10-261-0/+28
| | | | Commit the current patch of a rebase process.
* Introduce git_rebase_nextEdward Thomson2014-10-261-0/+13
| | | | | | `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.
* Introduce git_rebase_abortEdward Thomson2014-10-261-0/+13
| | | | | Abort an in-progress rebase and move the working directory and repository back to the ORIG_HEAD state.
* Introduce git_rebase to set up a rebase sessionEdward Thomson2014-10-261-0/+73
Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.