From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Sep 2010 21:59:53 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~195
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1e633418479926bc85ed21a4f91c845a3dd3ad66;p=git.git

Merge branch 'maint'

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

1e633418479926bc85ed21a4f91c845a3dd3ad66