Merge branch 'kh/update-ref'
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 21:31:57 +0000 (14:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 21:31:57 +0000 (14:31 -0700)
* kh/update-ref:
Make old sha1 optional with git update-ref -d
Clean up builtin-update-ref's option parsing

1  2 
Documentation/git-update-ref.txt
Simple merge