summaryrefslogtreecommitdiff
path: root/t/t3430-rebase-merges.sh
AgeCommit message (Expand)Author
2018-06-04Merge branch 'bc/t3430-fixup'Junio C Hamano
2018-06-04t3430: test clean-upbrian m. carlson
2018-06-01Merge branch 'js/rebase-recreate-merge'Junio C Hamano
2018-05-30sequencer: ensure labels that are object IDs are rewrittenbrian m. carlson
2018-05-06rebase --rebase-merges: root commits can be cousins, tooJohannes Schindelin
2018-05-06rebase --rebase-merges: a "merge" into a new root is a fast-forwardJohannes Schindelin
2018-05-06sequencer: allow introducing new root commitsJohannes Schindelin
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin
2018-04-26rebase --rebase-merges: avoid "empty merges"Johannes Schindelin
2018-04-26sequencer: handle post-rewrite for merge commandsJohannes Schindelin
2018-04-26sequencer: make refs generated by the `label` command worktree-localJohannes Schindelin
2018-04-26rebase: introduce the --rebase-merges optionJohannes Schindelin