]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'maint-1.6.4' into maint-1.6.5
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Jul 2010 04:51:58 +0000 (21:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Jul 2010 04:51:58 +0000 (21:51 -0700)
* maint-1.6.4:
  Check size of path buffer before writing into it
  rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option

1  2 
setup.c

diff --cc setup.c
Simple merge