Merge branch 'ab/case-insensitive-upstream-and-push-marker' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 21:24:28 +0000 (14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 21:24:28 +0000 (14:24 -0700)
commit166654719e28d902aeee3684acf510931b9b2095
tree015e9e6a6a23e0b30656598967002268385da8df
parent49e23678df9b427a14d5c48d1ff776f6d6b64325
parent244ea1b5e49081530e0ba5c717db1fdbe2bda73e
Merge branch 'ab/case-insensitive-upstream-and-push-marker' into next

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