aboutsummaryrefslogtreecommitdiff
path: root/t/t3430-rebase-merges.sh
AgeCommit message (Expand)Author
12 dayst: work around multibyte bug in quoted heredocs with Dash v0.5.13Patrick Steinhardt
2025-05-27Merge branch 'en/sequencer-comment-messages'Junio C Hamano
2025-05-19Merge branch 'pw/sequencer-reflog-use-after-free'Junio C Hamano
2025-05-16sequencer: make it clearer that commit descriptions are just commentsElijah Newren
2025-05-09sequencer: rework reflog message handlingPhillip Wood
2025-02-11rebase -i: reword empty commit after fast-forwardPhillip Wood
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt
2024-10-09rebase-merges: try and use branch names as labelsNicolas Guichard
2024-07-26t3430: drop unnecessary one-shot "VAR=val shell-func" invocationEric Sunshine
2024-06-11merge: fix leaking merge basesPatrick Steinhardt
2023-09-14Merge branch 'pw/rebase-i-after-failure'Junio C Hamano
2023-09-06rebase -i: fix adding failed command to the todo listPhillip Wood
2023-09-06rebase --continue: refuse to commit after failed commandPhillip Wood
2023-09-06rebase: fix rewritten list for failed pickPhillip Wood
2023-08-10rebase: allow overriding the maximal length of the generated labelsJohannes Schindelin
2023-05-20Merge branch 'js/rebase-count-fixes'Junio C Hamano
2023-05-14rebase -r: fix the total number shown in the progressJohannes Schindelin
2023-03-27rebase: add a config option for --rebase-mergesAlex Henrie
2023-03-27rebase: add documentation and test for --no-rebase-mergesAlex Henrie
2022-11-10sequencer: tighten label lookupsPhillip Wood
2022-11-10sequencer: unify label lookupPhillip Wood
2022-03-17tests: change "mkdir -p && write_script" to use "test_hook"Ævar Arnfjörð Bjarmason
2021-08-23rebase -r: fix merge -c with a merge strategyPhillip Wood
2021-08-20rebase -r: make 'merge -c' behave like rewordPhillip Wood
2020-11-19t34*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-06-09t/t3430: avoid undefined git diff behaviorChris Torek
2020-02-24lib-log-graph: consolidate test_cmp_graph logicAbhishek Kumar
2019-12-05Merge branch 'dl/t5520-cleanup'Junio C Hamano
2019-12-05Merge branch 'dd/rebase-merge-reserves-onto-label'Junio C Hamano
2019-12-05Merge branch 'js/rebase-r-safer-label'Junio C Hamano
2019-11-21t: teach test_cmp_rev to accept ! for not-equalsDenton Liu
2019-11-20sequencer: handle rebase-merges for "onto" messageDoan Tran Cong Danh
2019-11-18rebase -r: let `label` generate safer labelsMatthew Rogers
2019-10-16graph: smooth appearance of collapsing edges on commit linesJames Coglan
2019-09-30Merge branch 'dl/use-sq-from-test-lib'Junio C Hamano
2019-09-30Merge branch 'bc/hash-independent-tests-part-5'Junio C Hamano
2019-09-18Merge branch 'js/rebase-r-strategy'Junio C Hamano
2019-09-06t: use common $SQ variableDenton Liu
2019-08-20t3430: avoid hard-coded object IDsbrian m. carlson
2019-07-31rebase -r: support merge strategies other than `recursive`Johannes Schindelin
2019-07-09Merge branch 'pw/rebase-abort-clean-rewritten'Junio C Hamano
2019-05-19rebase -r: always reword merge -cPhillip Wood
2019-05-15rebase --abort/--quit: cleanup refs/rewrittenPhillip Wood
2019-04-02tests (rebase): spell out the `--force-rebase` optionJohannes Schindelin
2019-01-28implicit interactive rebase: don't run sequence editorPhillip Wood
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
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 03:22:23 +0000