Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rebase: updates based on PR comments | Edward Thomson | 2014-10-26 | 1 | -17/+15 |
| | |||||
* | s/git_merge_head/git_annotated_commit | Edward Thomson | 2014-10-26 | 1 | -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 const | Edward Thomson | 2014-10-26 | 1 | -1/+1 |
| | |||||
* | git_rebase: iterators for operations | Edward Thomson | 2014-10-26 | 1 | -0/+27 |
| | |||||
* | rebase: preload all operations | Edward Thomson | 2014-10-26 | 1 | -2/+2 |
| | |||||
* | rebase: init/open a git_rebase object | Edward Thomson | 2014-10-26 | 1 | -11/+32 |
| | |||||
* | git_rebase_next: provide info about the operation | Edward Thomson | 2014-10-26 | 1 | -6/+68 |
| | |||||
* | git_rebase_finish: rewrite notes when finishing rebase | Edward Thomson | 2014-10-26 | 1 | -1/+12 |
| | |||||
* | Introduce git_rebase_finish to complete a rebase | Edward Thomson | 2014-10-26 | 1 | -0/+12 |
| | |||||
* | git_rebase_commit: drop already-picked commits | Edward Thomson | 2014-10-26 | 1 | -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_commit | Edward Thomson | 2014-10-26 | 1 | -0/+28 |
| | | | | Commit the current patch of a rebase process. | ||||
* | Introduce git_rebase_next | Edward Thomson | 2014-10-26 | 1 | -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_abort | Edward Thomson | 2014-10-26 | 1 | -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 session | Edward Thomson | 2014-10-26 | 1 | -0/+73 |
Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported. |