From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Aug 2018 20:09:59 +0000 (-0700)
Subject: Merge branch 'js/pull-rebase-type-shorthand'
X-Git-Tag: v2.19.0-rc0~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c757aa2d12ceeb5a86c2da8ad1e9e752625af739;p=git

Merge branch 'js/pull-rebase-type-shorthand'

"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
---

c757aa2d12ceeb5a86c2da8ad1e9e752625af739