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: https://git.lorimer.id.au/gitweb.git/diff_plain/66915b5d7cc9b66bf8c452bb62c67da371c21d90?hp=-c

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
diff --combined Documentation/git-update-ref.txt
index 7f7e3d197b,80b94c36d9..bae2c8b7ec
--- a/Documentation/git-update-ref.txt
+++ b/Documentation/git-update-ref.txt
@@@ -7,7 -7,7 +7,7 @@@ git-update-ref - Update the object nam
  
  SYNOPSIS
  --------
- 'git-update-ref' [-m <reason>] (-d <ref> <oldvalue> | [--no-deref] <ref> <newvalue> [<oldvalue>])
+ 'git-update-ref' [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] <ref> <newvalue> [<oldvalue>])
  
  DESCRIPTION
  -----------
@@@ -90,4 -90,4 +90,4 @@@ Written by Linus Torvalds <torvalds@osd
  
  GIT
  ---
 -Part of the linkgit:git[7] suite
 +Part of the linkgit:git[1] suite