Merge branch 'maint-1.6.6' into maint-1.7.0
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Jul 2010 04:52:48 +0000 (21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Jul 2010 04:52:48 +0000 (21:52 -0700)
commit28bf4ba014c9b41679f41580fa9e1cc294b240d9
treea6022548d912545768678c25ffbac6c57461787e
parent4b2343fa4125f73a26cb20016a3ae3a27c00dd6f
parentad336054068074ed614d0bb54bb169e5263499d7
Merge branch 'maint-1.6.6' into maint-1.7.0

* maint-1.6.6:
  request-pull.txt: Document -p option
  Check size of path buffer before writing into it
  rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
builtin-rev-parse.c
setup.c