]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/case-insensitive-upstream-and-push-marker'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:07:16 +0000 (14:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:07:16 +0000 (14:07 -0700)
On many keyboards, typing "@{" involves holding down SHIFT key and
one can easily end up with "@{Up..." when typing "@{upstream}".  As
the upstream/push keywords do not appear anywhere else in the syntax,
we can safely accept them case insensitively without introducing
ambiguity or confusion  to solve this.

* ab/case-insensitive-upstream-and-push-marker:
  rev-parse: match @{upstream}, @{u} and @{push} case-insensitively


Trivial merge