From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Jun 2008 01:12:47 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0-rc0~200
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c0f5c69c680395a45294184dcf0923cea530b9af?ds=inline;hp=--cc

Merge branch 'maint'

* maint:
GIT 1.5.5.5
GIT 1.5.4.6
git-shell: accept "git foo" form
diff --check: do not discard error status upon seeing a good line
---

c0f5c69c680395a45294184dcf0923cea530b9af