Merge branch 'maint-1.6.5' into maint-1.6.6
commitad336054068074ed614d0bb54bb169e5263499d7
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Jul 2010 04:52:29 +0000 (25 21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Jul 2010 04:52:29 +0000 (25 21:52 -0700)
treefc027032ffafab2e5ad113bf42766f51cd4ebe5b
parentb75686455c0524f167b6a878c124df40db34b325
parentd8e3ac7e7264863544c95069024f1cbaedb5db3d
Merge branch 'maint-1.6.5' into maint-1.6.6

* maint-1.6.5:
  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