summary refs log tree commit diff
path: root/t/t3430-rebase-merges.sh
AgeCommit message (Expand)AuthorFilesLines
2022-03-17tests: change "mkdir -p && write_script" to use "test_hook"Ævar Arnfjörð Bjarmason1-3/+3
2021-08-23rebase -r: fix merge -c with a merge strategyPhillip Wood1-0/+18
2021-08-20rebase -r: make 'merge -c' behave like rewordPhillip Wood1-9/+11
2020-11-19t34*: adjust the references to the default branch name "main"Johannes Schindelin1-9/+9
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-06-09t/t3430: avoid undefined git diff behaviorChris Torek1-1/+1
2020-02-24lib-log-graph: consolidate test_cmp_graph logicAbhishek Kumar1-3/+2
2019-12-05Merge branch 'dl/t5520-cleanup'Junio C Hamano1-1/+1
2019-12-05Merge branch 'dd/rebase-merge-reserves-onto-label'Junio C Hamano1-0/+21
2019-12-05Merge branch 'js/rebase-r-safer-label'Junio C Hamano1-0/+6
2019-11-21t: teach test_cmp_rev to accept ! for not-equalsDenton Liu1-1/+1
2019-11-20sequencer: handle rebase-merges for "onto" messageDoan Tran Cong Danh1-0/+21
2019-11-18rebase -r: let `label` generate safer labelsMatthew Rogers1-0/+6
2019-10-16graph: smooth appearance of collapsing edges on commit linesJames Coglan1-1/+1
2019-09-30Merge branch 'dl/use-sq-from-test-lib'Junio C Hamano1-1/+0
2019-09-30Merge branch 'bc/hash-independent-tests-part-5'Junio C Hamano1-8/+15
2019-09-18Merge branch 'js/rebase-r-strategy'Junio C Hamano1-0/+21
2019-09-06t: use common $SQ variableDenton Liu1-1/+0
2019-08-20t3430: avoid hard-coded object IDsbrian m. carlson1-8/+15
2019-07-31rebase -r: support merge strategies other than `recursive`Johannes Schindelin1-0/+21
2019-07-09Merge branch 'pw/rebase-abort-clean-rewritten'Junio C Hamano1-1/+17
2019-05-19rebase -r: always reword merge -cPhillip Wood1-0/+13
2019-05-15rebase --abort/--quit: cleanup refs/rewrittenPhillip Wood1-1/+17
2019-04-02tests (rebase): spell out the `--force-rebase` optionJohannes Schindelin1-2/+2
2019-01-28implicit interactive rebase: don't run sequence editorPhillip Wood1-1/+1
2018-11-13rebase -r: do not write MERGE_HEAD unless neededJohannes Schindelin1-1/+1
2018-11-13rebase -r: demonstrate bug with conflicting mergesJohannes Schindelin1-0/+16
2018-08-20Merge branch 'pw/rebase-i-merge-segv-fix'Junio C Hamano1-7/+23
2018-08-16rebase -i: fix SIGSEGV when 'merge <branch>' failsPhillip Wood1-1/+14
2018-08-16t3430: add conflicting commitPhillip Wood1-6/+9
2018-08-09rebase --exec: make it work with --rebase-mergesJohannes Schindelin1-1/+1
2018-08-06t3430: demonstrate what -r, --autosquash & --exec should doJohannes Schindelin1-0/+17
2018-07-11rebase --rebase-merges: add support for octopus mergesJohannes Schindelin1-0/+34
2018-06-04Merge branch 'bc/t3430-fixup'Junio C Hamano1-3/+2
2018-06-04t3430: test clean-upbrian m. carlson1-3/+2
2018-06-01Merge branch 'js/rebase-recreate-merge'Junio C Hamano1-0/+17
2018-05-30sequencer: ensure labels that are object IDs are rewrittenbrian m. carlson1-0/+17
2018-05-06rebase --rebase-merges: root commits can be cousins, tooJohannes Schindelin1-0/+25
2018-05-06rebase --rebase-merges: a "merge" into a new root is a fast-forwardJohannes Schindelin1-0/+13
2018-05-06sequencer: allow introducing new root commitsJohannes Schindelin1-0/+34
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin1-0/+18
2018-04-26rebase --rebase-merges: avoid "empty merges"Johannes Schindelin1-0/+8
2018-04-26sequencer: handle post-rewrite for merge commandsJohannes Schindelin1-0/+25
2018-04-26sequencer: make refs generated by the `label` command worktree-localJohannes Schindelin1-0/+14
2018-04-26rebase: introduce the --rebase-merges optionJohannes Schindelin1-0/+179
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-03 03:14:52 +0000