From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Aug 2013 22:49:55 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.4-rc3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96cb27a9d2db3c01b8e296a0fbc1da1da09d1412;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  parse-options: fix clang opterror() -Wunused-value warning
---

96cb27a9d2db3c01b8e296a0fbc1da1da09d1412