summaryrefslogtreecommitdiff
path: root/tests/rebase
Commit message (Expand)AuthorAgeFilesLines
* Fixed unused warning in tests/rebase/merge.cTomas Paladin Volf2015-04-301-0/+5
* rebase: include checkout opts within rebase optsEdward Thomson2015-04-201-1/+2
* rebase: test checkout options for rebaseEdward Thomson2015-04-201-0/+49
* rebase: init and open take a rebase_optionsEdward Thomson2015-04-204-76/+49
* rebase: take `checkout_options` where appropriateEdward Thomson2015-04-204-22/+22
* rebase: block rebase_commit with unstaged changesEdward Thomson2015-04-201-0/+35
* rebase: commit should return GIT_EUNMERGEDEdward Thomson2015-04-201-1/+3
* rebase: identify a rebase that has not startedEdward Thomson2015-04-201-1/+1
* repository: remove log message override for switching the active branchCarlos Martín Nieto2015-03-031-1/+1
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-034-31/+23
* rebase: allow `NULL` branch to indicate `HEAD`Edward Thomson2015-02-131-0/+49
* rebase: provide NULL `exec` on non-EXEC operationsEdward Thomson2015-02-131-0/+1
* Fix broken merge tests due to autocrlf was not falseLinquize2014-12-071-0/+12
* notes: move the notes name argumentCarlos Martín Nieto2014-12-061-2/+2
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-264-103/+104
* rebase: clean up some warnings and memory leaksEdward Thomson2014-10-261-0/+1
* git_rebase: iterators for operationsEdward Thomson2014-10-261-0/+108
* rebase: preload all operationsEdward Thomson2014-10-261-12/+12
* rebase: init/open a git_rebase objectEdward Thomson2014-10-263-50/+88
* git_rebase_next: provide info about the operationEdward Thomson2014-10-261-17/+34
* git_rebase_finish: rewrite notes when finishing rebaseEdward Thomson2014-10-261-1/+93
* git_rebase_commit: write HEAD's reflog appropriatelyEdward Thomson2014-10-261-1/+9
* Introduce git_rebase_finish to complete a rebaseEdward Thomson2014-10-261-0/+57
* git_rebase_next: test that we return GIT_ITEROVEREdward Thomson2014-10-261-0/+50
* git_rebase_commit: drop already-picked commitsEdward Thomson2014-10-261-0/+38
* Introduce git_rebase_commitEdward Thomson2014-10-261-0/+91
* git_rebase_next: write conflicts nicely during rebaseEdward Thomson2014-10-261-0/+59
* Introduce git_rebase_nextEdward Thomson2014-10-261-0/+59
* Introduce git_rebase_abortEdward Thomson2014-10-261-0/+148
* Introduce git_rebase to set up a rebase sessionEdward Thomson2014-10-261-0/+328