summaryrefslogtreecommitdiff
path: root/t/t3430-rebase-merges.sh
AgeCommit message (Expand)AuthorFilesLines
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-12-12 23:07:24 +0000