rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`

Johannes Schindelin committed about 7 years ago

t3418: test `rebase -r` with merge strategies

Johannes Schindelin committed about 7 years ago

t/lib-rebase: prepare for testing `git rebase --rebase-merges`

Johannes Schindelin committed about 7 years ago

rebase -r: support merge strategies other than `recursive`

Johannes Schindelin committed about 7 years ago

t3427: fix another incorrect assumption

Johannes Schindelin committed about 7 years ago

t3427: accommodate for the `rebase --merge` backend having been replaced

Johannes Schindelin committed about 7 years ago

t3427: fix erroneous assumption

Johannes Schindelin committed about 7 years ago

t3427: condense the unnecessarily repetitive test cases into three

Johannes Schindelin committed about 7 years ago

t3427: move the `filter-branch` invocation into the `setup` case

Johannes Schindelin committed about 7 years ago

t3427: simplify the `setup` test case significantly

Johannes Schindelin committed about 7 years ago

t3427: add a clarifying comment

Johannes Schindelin committed about 7 years ago

rebase: fold git-rebase--common into the -p backend

Johannes Schindelin committed about 7 years ago

sequencer: the `am` and `rebase--interactive` scripts are gone

Johannes Schindelin committed about 7 years ago

.gitignore: there is no longer a built-in `git-rebase--interactive`

Johannes Schindelin committed about 7 years ago

t3400: stop referring to the scripted rebase

Johannes Schindelin committed about 7 years ago

Drop unused git-rebase--am.sh

Johannes Schindelin committed about 7 years ago

t5510-fetch: fix negated 'test_i18ngrep' invocation

SZEDER Gábor committed about 7 years ago

t: sort output of hashmap iteration

Jeff King committed about 7 years ago

l10n: sv.po: Update Swedish translation (4676t0f0u)

Peter Krefting committed about 7 years ago

grep: fix worktree case in submodules

Matheus Tavares committed about 7 years ago