summaryrefslogtreecommitdiff
path: root/t/t3430-rebase-merges.sh
AgeCommit message (Expand)AuthorFilesLines
2019-09-30Merge branch 'dl/use-sq-from-test-lib'Libravatar Junio C Hamano1-1/+0
2019-09-30Merge branch 'bc/hash-independent-tests-part-5'Libravatar Junio C Hamano1-8/+15
2019-09-18Merge branch 'js/rebase-r-strategy'Libravatar Junio C Hamano1-0/+21
2019-09-06t: use common $SQ variableLibravatar Denton Liu1-1/+0
2019-08-20t3430: avoid hard-coded object IDsLibravatar brian m. carlson1-8/+15
2019-07-31rebase -r: support merge strategies other than `recursive`Libravatar Johannes Schindelin1-0/+21
2019-07-09Merge branch 'pw/rebase-abort-clean-rewritten'Libravatar Junio C Hamano1-1/+17
2019-05-19rebase -r: always reword merge -cLibravatar Phillip Wood1-0/+13
2019-05-15rebase --abort/--quit: cleanup refs/rewrittenLibravatar Phillip Wood1-1/+17
2019-04-02tests (rebase): spell out the `--force-rebase` optionLibravatar Johannes Schindelin1-2/+2
2019-01-28implicit interactive rebase: don't run sequence editorLibravatar Phillip Wood1-1/+1
2018-11-13rebase -r: do not write MERGE_HEAD unless neededLibravatar Johannes Schindelin1-1/+1
2018-11-13rebase -r: demonstrate bug with conflicting mergesLibravatar Johannes Schindelin1-0/+16
2018-08-20Merge branch 'pw/rebase-i-merge-segv-fix'Libravatar Junio C Hamano1-7/+23
2018-08-16rebase -i: fix SIGSEGV when 'merge <branch>' failsLibravatar Phillip Wood1-1/+14
2018-08-16t3430: add conflicting commitLibravatar Phillip Wood1-6/+9
2018-08-09rebase --exec: make it work with --rebase-mergesLibravatar Johannes Schindelin1-1/+1
2018-08-06t3430: demonstrate what -r, --autosquash & --exec should doLibravatar Johannes Schindelin1-0/+17
2018-07-11rebase --rebase-merges: add support for octopus mergesLibravatar Johannes Schindelin1-0/+34
2018-06-04Merge branch 'bc/t3430-fixup'Libravatar Junio C Hamano1-3/+2
2018-06-04t3430: test clean-upLibravatar brian m. carlson1-3/+2
2018-06-01Merge branch 'js/rebase-recreate-merge'Libravatar Junio C Hamano1-0/+17
2018-05-30sequencer: ensure labels that are object IDs are rewrittenLibravatar brian m. carlson1-0/+17
2018-05-06rebase --rebase-merges: root commits can be cousins, tooLibravatar Johannes Schindelin1-0/+25
2018-05-06rebase --rebase-merges: a "merge" into a new root is a fast-forwardLibravatar Johannes Schindelin1-0/+13
2018-05-06sequencer: allow introducing new root commitsLibravatar Johannes Schindelin1-0/+34
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsLibravatar Johannes Schindelin1-0/+18
2018-04-26rebase --rebase-merges: avoid "empty merges"Libravatar Johannes Schindelin1-0/+8
2018-04-26sequencer: handle post-rewrite for merge commandsLibravatar Johannes Schindelin1-0/+25
2018-04-26sequencer: make refs generated by the `label` command worktree-localLibravatar Johannes Schindelin1-0/+14
2018-04-26rebase: introduce the --rebase-merges optionLibravatar Johannes Schindelin1-0/+179
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 10:41:32 +0000