summaryrefslogtreecommitdiff
path: root/t/t3430-rebase-merges.sh
AgeCommit message (Expand)Author
2018-11-13rebase -r: do not write MERGE_HEAD unless neededJohannes Schindelin
2018-11-13rebase -r: demonstrate bug with conflicting mergesJohannes Schindelin
2018-08-20Merge branch 'pw/rebase-i-merge-segv-fix'Junio C Hamano
2018-08-16rebase -i: fix SIGSEGV when 'merge <branch>' failsPhillip Wood
2018-08-16t3430: add conflicting commitPhillip Wood
2018-08-09rebase --exec: make it work with --rebase-mergesJohannes Schindelin
2018-08-06t3430: demonstrate what -r, --autosquash & --exec should doJohannes Schindelin
2018-07-11rebase --rebase-merges: add support for octopus mergesJohannes Schindelin
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-18 06:02:53 (GMT)