From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2018 02:04:55 +0000 (+0900)
Subject: Merge branch 'pk/rebase-in-c-5-test'
X-Git-Tag: v2.20.0-rc0~90
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fd1a9e903fd2d1bcf49723c282f75c83908484f9

Merge branch 'pk/rebase-in-c-5-test'

Rewrite "git rebase" in C.

* pk/rebase-in-c-5-test:
builtin rebase: error out on incompatible option/mode combinations
builtin rebase: use no-op editor when interactive is "implied"
builtin rebase: show progress when connected to a terminal
builtin rebase: fast-forward to onto if it is a proper descendant
builtin rebase: optionally pass custom reflogs to reset_head()
builtin rebase: optionally auto-detect the upstream
---

fd1a9e903fd2d1bcf49723c282f75c83908484f9