summaryrefslogtreecommitdiff
path: root/t/t3430-rebase-merges.sh
Commit message (Expand)AuthorAgeFilesLines
* rebase: add a config option for --rebase-mergesAlex Henrie2023-03-271-0/+34
* rebase: add documentation and test for --no-rebase-mergesAlex Henrie2023-03-271-0/+10
* sequencer: tighten label lookupsPhillip Wood2022-11-101-0/+9
* sequencer: unify label lookupPhillip Wood2022-11-101-0/+8
* tests: change "mkdir -p && write_script" to use "test_hook"Ævar Arnfjörð Bjarmason2022-03-171-3/+3
* rebase -r: fix merge -c with a merge strategyPhillip Wood2021-08-231-0/+18
* rebase -r: make 'merge -c' behave like rewordPhillip Wood2021-08-201-9/+11
* t34*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-9/+9
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* t/t3430: avoid undefined git diff behaviorChris Torek2020-06-091-1/+1
* lib-log-graph: consolidate test_cmp_graph logicAbhishek Kumar2020-02-241-3/+2
* Merge branch 'dl/t5520-cleanup'Junio C Hamano2019-12-051-1/+1
|\
| * t: teach test_cmp_rev to accept ! for not-equalsDenton Liu2019-11-211-1/+1
* | Merge branch 'dd/rebase-merge-reserves-onto-label'Junio C Hamano2019-12-051-0/+21
|\ \
| * | sequencer: handle rebase-merges for "onto" messageDoan Tran Cong Danh2019-11-201-0/+21
* | | Merge branch 'js/rebase-r-safer-label'Junio C Hamano2019-12-051-0/+6
|\ \ \ | |/ /
| * | rebase -r: let `label` generate safer labelsMatthew Rogers2019-11-181-0/+6
| |/
* | graph: smooth appearance of collapsing edges on commit linesJames Coglan2019-10-161-1/+1
|/
* Merge branch 'dl/use-sq-from-test-lib'Junio C Hamano2019-09-301-1/+0
|\
| * t: use common $SQ variableDenton Liu2019-09-061-1/+0
* | Merge branch 'bc/hash-independent-tests-part-5'Junio C Hamano2019-09-301-8/+15
|\ \
| * | t3430: avoid hard-coded object IDsbrian m. carlson2019-08-201-8/+15
| |/
* | Merge branch 'js/rebase-r-strategy'Junio C Hamano2019-09-181-0/+21
|\ \ | |/ |/|
| * rebase -r: support merge strategies other than `recursive`Johannes Schindelin2019-07-311-0/+21
* | Merge branch 'pw/rebase-abort-clean-rewritten'Junio C Hamano2019-07-091-1/+17
|\ \
| * | rebase --abort/--quit: cleanup refs/rewrittenPhillip Wood2019-05-151-1/+17
* | | rebase -r: always reword merge -cPhillip Wood2019-05-191-0/+13
| |/ |/|
* | tests (rebase): spell out the `--force-rebase` optionJohannes Schindelin2019-04-021-2/+2
|/
* implicit interactive rebase: don't run sequence editorPhillip Wood2019-01-281-1/+1
* rebase -r: do not write MERGE_HEAD unless neededJohannes Schindelin2018-11-131-1/+1
* rebase -r: demonstrate bug with conflicting mergesJohannes Schindelin2018-11-131-0/+16
* Merge branch 'pw/rebase-i-merge-segv-fix'Junio C Hamano2018-08-201-7/+23
|\
| * rebase -i: fix SIGSEGV when 'merge <branch>' failsPhillip Wood2018-08-161-1/+14
| * t3430: add conflicting commitPhillip Wood2018-08-161-6/+9
* | rebase --exec: make it work with --rebase-mergesJohannes Schindelin2018-08-091-1/+1
* | t3430: demonstrate what -r, --autosquash & --exec should doJohannes Schindelin2018-08-061-0/+17
* | 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
View Lorry Controller Status