Andrew's git / gitweb.git / diff
?
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 patch | diff1 | diff2 | blob | history
diff --combined Documentation/git-update-ref.txt
index 7f7e3d197bafbbb2efe610096b0cad6901488be5,80b94c36d914756cdf052355e5a63ea2014ae181..bae2c8b7eced2042af0437b1e92cc73636c7cfa5
--- 1/Documentation/git-update-ref.txt
--- 2/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