]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
* maint-1.6.4:
  rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option

1  2 
builtin/rev-parse.c

Simple merge