summaryrefslogtreecommitdiff
path: root/tests/rebase
Commit message (Expand)AuthorAgeFilesLines
* rebase: orig_head and onto accessorsErik Aigner2019-04-211-0/+10
* references: use new names in internal usageethomson/git_refEdward Thomson2019-01-171-3/+3
* object_type: use new enumeration namesethomson/index_fixesEdward Thomson2018-12-013-16/+16
* treewide: remove use of C++ style commentsPatrick Steinhardt2018-07-136-6/+6
* index: commit the changes to the index properlyEdward Thomson2018-06-291-1/+2
* Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-101-1/+1
* tests: rebase::submodule: verify initialization method callsPatrick Steinhardt2017-07-281-7/+7
* tests: fix the rebase-submodule testEtienne Samson2017-07-251-7/+36
* rebase: ignore untracked files in submodulesDavid Turner2017-03-031-0/+65
* 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-022-0/+82
* rebase: test rebase (merge) w/ no common ancestorEdward Thomson2016-05-032-5/+104
* rebase::abort: test we can abort rebase by revspecEdward Thomson2016-04-261-0/+19
* rebase: correctly finish rebasing detached headsethomson/rebase_detachedEdward Thomson2016-04-211-0/+50
* rebase: test abort immediately after initEdward Thomson2016-04-211-5/+65
* Merge pull request #3623 from ethomson/rebase_with_commitCarlos Martín Nieto2016-03-093-5/+288
|\
| * rebase: additional tests for completing a rebaseEdward Thomson2016-02-282-5/+83
| * rebase: additional setup tests of exotic behaviorEdward Thomson2016-02-171-0/+205
* | rebase: persist a single in-memory indexEdward Thomson2016-02-152-6/+24
|/
* rebase: allow custom merge_optionsEdward Thomson2016-02-111-0/+30
* rebase: introduce inmemory rebasingEdward Thomson2016-02-112-6/+138
* 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
View Lorry Controller Status