Andrew's git / gitweb.git / diff
?
Merge branch 'js/pull-rebase-type-shorthand'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:59 +0000 (13:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:59 +0000 (13:09 -0700)
"git pull --rebase=interactive" learned "i" as a short-hand for
"interactive".

* js/pull-rebase-type-shorthand:
pull --rebase=<type>: allow single-letter abbreviations for the type

1  2 
builtin/pull.c patch | diff1 | diff2 | blob | history
t/t5520-pull.sh patch | diff1 | diff2 | blob | history
diff --cc builtin/pull.c
Simple merge
diff --cc t/t5520-pull.sh
Simple merge