Code

Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 21:59:57 +0000 (14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 21:59:57 +0000 (14:59 -0700)
commitfe9f567f6eaf765066428c98a0aa41cd4b0cdd0a
tree0eb219adf25b64a97b3ea5a3e489690776dddc5e
parent92b87a9bab1a84261d2381e813e58577967bdc79
parent1e633418479926bc85ed21a4f91c845a3dd3ad66
Merge branch 'master' into next

* master:
  Fix typo in pack-objects' usage
  Make sure that git_getpass() never returns NULL
  t0004 (unwritable files): simplify error handling
  rev-list-options: clarify --parents and --children