summaryrefslogtreecommitdiff
path: root/tests/rebase/merge.c
Commit message (Expand)AuthorAgeFilesLines
* treewide: remove use of C++ style commentsPatrick Steinhardt2018-07-131-1/+1
* rebase: plug a leak in the testscmn/plug-test-leakCarlos Martín Nieto2016-12-171-0/+1
* git_rebase_init: correctly handle detached HEADDavid Turner2016-12-011-0/+53
* rebase: test rebasing a new commit with subfolderEdward Thomson2016-06-021-0/+39
* rebase: test rebase (merge) w/ no common ancestorEdward Thomson2016-05-031-0/+48
* rebase: correctly finish rebasing detached headsethomson/rebase_detachedEdward Thomson2016-04-211-0/+50
* rebase: additional tests for completing a rebaseEdward Thomson2016-02-281-0/+57
* rebase: allow custom merge_optionsEdward Thomson2016-02-111-0/+30
* 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-201-50/+26
* rebase: take `checkout_options` where appropriateEdward Thomson2015-04-201-8/+8
* rebase: block rebase_commit with unstaged changesEdward Thomson2015-04-201-0/+35
* rebase: commit should return GIT_EUNMERGEDEdward Thomson2015-04-201-1/+3
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-031-8/+8
* 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-261-41/+41
* rebase: preload all operationsEdward Thomson2014-10-261-12/+12
* rebase: init/open a git_rebase objectEdward Thomson2014-10-261-38/+54
* 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