From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Jun 2008 21:31:57 +0000 (-0700)
Subject: Merge branch 'kh/update-ref'
X-Git-Tag: v1.6.0-rc0~236
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66915b5d7cc9b66bf8c452bb62c67da371c21d90;p=git.git

Merge branch 'kh/update-ref'

* kh/update-ref:
  Make old sha1 optional with git update-ref -d
  Clean up builtin-update-ref's option parsing
---

66915b5d7cc9b66bf8c452bb62c67da371c21d90