summaryrefslogtreecommitdiffstats
path: root/t/t3430-rebase-merges.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* rebase --rebase-merges: add support for octopus mergesJohannes Schindelin2018-07-111-0/+34
* Merge branch 'bc/t3430-fixup'Junio C Hamano2018-06-041-3/+2
|\
| * t3430: test clean-upbrian m. carlson2018-06-041-3/+2
* | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-06-011-0/+17
|\|
| * sequencer: ensure labels that are object IDs are rewrittenbrian m. carlson2018-05-301-0/+17
* | rebase --rebase-merges: root commits can be cousins, tooJohannes Schindelin2018-05-061-0/+25
* | rebase --rebase-merges: a "merge" into a new root is a fast-forwardJohannes Schindelin2018-05-061-0/+13
* | sequencer: allow introducing new root commitsJohannes Schindelin2018-05-061-0/+34
|/
* rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin2018-04-261-0/+18
* rebase --rebase-merges: avoid "empty merges"Johannes Schindelin2018-04-261-0/+8
* sequencer: handle post-rewrite for merge commandsJohannes Schindelin2018-04-261-0/+25
* sequencer: make refs generated by the `label` command worktree-localJohannes Schindelin2018-04-261-0/+14
* rebase: introduce the --rebase-merges optionJohannes Schindelin2018-04-261-0/+179