summaryrefslogtreecommitdiff
path: root/t/t9402-git-cvsserver-refs.sh
diff options
context:
space:
mode:
authorLibravatar Pratik Karki <predatoramigo@gmail.com>2018-09-04 14:59:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-06 11:56:19 -0700
commit361badd3933c5c319229896f2ad2d546d95cd8a7 (patch)
tree537849d53088af6762afaf508ac37340af5ad5dd /t/t9402-git-cvsserver-refs.sh
parentbuiltin rebase: stop if `git am` is in progress (diff)
downloadtgif-361badd3933c5c319229896f2ad2d546d95cd8a7.tar.xz
builtin rebase: allow selecting the rebase "backend"
With this commit the builtin rebase supports selecting the "rebase backends" (or "type") `interactive`, `preserve-merges`, and `merge`. The `state_dir` was already handled according to the rebase type in a previous commit. Note that there is one quirk in the shell script: `--interactive` followed by `--merge` won't reset the type to "merge" but keeps the type as "interactive". And as t3418 tests this explicitly, we have to support it in the builtin rebase, too. Likewise, `--interactive` followed by `--preserve-merges` makes it an "explicitly interactive" rebase, i.e. a rebase that should show the todo list, while `--preserve-merges` alone is not interactive (and t5520 tests for this via `git pull --rebase=preserve`). Signed-off-by: Pratik Karki <predatoramigo@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9402-git-cvsserver-refs.sh')
0 files changed, 0 insertions, 0 deletions