]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/pull.c
pull --rebase=<type>: allow single-letter abbreviations for the type
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 4 Aug 2018 19:23:09 +0000 (12:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2018 20:04:28 +0000 (13:04 -0700)
commit46af44b07dd433c073778f0d5ab27d0167dbcec4
tree0de805aa54c8d8718e358ce3b087985725c08b8f
parent53f9a3e157dbbc901a02ac2c73346d375e24978c
pull --rebase=<type>: allow single-letter abbreviations for the type

Git for Windows' original 4aa8b8c8283 (Teach 'git pull' to handle
--rebase=interactive, 2011-10-21) had support for the very convenient
abbreviation

git pull --rebase=i

which was later lost when it was ported to the builtin `git pull`, and
it was not introduced before the patch eventually made it into Git as
f5eb87b98dd (pull: allow interactive rebase with --rebase=interactive,
2016-01-13).

However, it is *really* a useful short hand for the occasional rebasing
pull on branches that do not usually want to be rebased.

So let's reintroduce this convenience, at long last.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/pull.c
t/t5520-pull.sh