summaryrefslogtreecommitdiff
path: root/src/rebase.c
Commit message (Collapse)AuthorAgeFilesLines
...
* rebase: check alloc resultEdward Thomson2015-02-271-0/+1
|
* Merge pull request #2831 from ethomson/merge_lockCarlos Martín Nieto2015-02-151-6/+9
|\ | | | | merge: lock index during the merge (not just checkout)
| * indexwriter: an indexwriter for repo operationsEdward Thomson2015-02-141-22/+8
| | | | | | | | | | Provide git_indexwriter_init_for_operation for the common locking pattern in merge, rebase, revert and cherry-pick.
| * merge-like operations: lock index while workingEdward Thomson2015-02-141-3/+20
| |
* | rebase: `CHECKOUT_SAFE` instead of `FORCE`Edward Thomson2015-02-131-8/+12
| | | | | | | | | | Switch to a standard branch-switching pattern of a `SAFE` checkout, then updating `HEAD`.
* | rebase: allow `NULL` branch to indicate `HEAD`Edward Thomson2015-02-131-2/+16
| | | | | | | | | | Don't require the branch to rebase, if given `NULL`, simply look up `HEAD`.
* | rebase: provide NULL `exec` on non-EXEC operationsEdward Thomson2015-02-131-9/+28
|/ | | | | Users may want to try to pay attention to the `exec` field on all rebase operations.
* Check rebase options version on public entry pointsjamill/rebase_opt_ver_checkJameson Miller2015-02-121-1/+3
|
* Check the result of git_buf_joinpathJacques Germishuys2014-12-301-1/+2
|
* Plug some leaksJacques Germishuys2014-12-291-1/+2
|
* notes: move the notes name argumentCarlos Martín Nieto2014-12-061-2/+2
| | | | | Make it consistent between git_note_create() and git_note_remote() by putting it after the repository.
* rebase: updates based on PR commentsEdward Thomson2014-10-261-17/+31
|
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-19/+21
| | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
* rebase: clean up some warnings and memory leaksEdward Thomson2014-10-261-26/+14
|
* rebase: oid member of operation should be constEdward Thomson2014-10-261-2/+2
|
* git_rebase: iterators for operationsEdward Thomson2014-10-261-0/+21
|
* rebase: preload all operationsEdward Thomson2014-10-261-111/+151
|
* rebase: init/open a git_rebase objectEdward Thomson2014-10-261-234/+276
|
* git_rebase_next: provide info about the operationEdward Thomson2014-10-261-2/+9
|
* git_rebase_finish: rewrite notes when finishing rebaseEdward Thomson2014-10-261-16/+150
|
* git_rebase_commit: write HEAD's reflog appropriatelyEdward Thomson2014-10-261-3/+9
|
* Introduce git_rebase_finish to complete a rebaseEdward Thomson2014-10-261-1/+62
|
* git_rebase_commit: drop already-picked commitsEdward Thomson2014-10-261-4/+15
| | | | | | 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-11/+110
| | | | Commit the current patch of a rebase process.
* git_rebase_next: write conflicts nicely during rebaseEdward Thomson2014-10-261-18/+102
|
* Introduce git_rebase_nextEdward Thomson2014-10-261-0/+156
| | | | | | `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/+128
| | | | | 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/+332
Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.
View Lorry Controller Status