Merge branch 'maint-1.6.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jul 2010 18:13:40 +0000 (11:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jul 2010 18:13:40 +0000 (11:13 -0700)
commit878bd809d7c879f1a9ea00bdb4cb97d846ef4e93
treea7187cf9eef1b4bcdf71cd53fb74d0e4428ca3e2
parent8e99859266fa2f565d951a0a2ed8aed4b6e2ae8a
parent29981380d03ffa63765dbeaea53a7ac9e8d6bc4f
Merge branch 'maint-1.6.4' into maint

* maint-1.6.4:
  rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
builtin/rev-parse.c