From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2014 18:38:38 +0000 (-0700)
Subject: Merge branch 'jc/parseopt-verify-short-name'
X-Git-Tag: v2.2.0-rc0~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dbdb3bed63ab1bb0b44a398322d736aafbeb841;p=thirdparty%2Fgit.git

Merge branch 'jc/parseopt-verify-short-name'

Add checks for a common programming mistake to assign the same
short option name to two separate options to help developers.

* jc/parseopt-verify-short-name:
  parse-options: detect attempt to add a duplicate short option name
---

5dbdb3bed63ab1bb0b44a398322d736aafbeb841