From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Feb 2010 23:40:59 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ca5812d2e3c72b09008422975740aff41a2c65a0?hp=-c

Merge branch 'maint'

* maint:
Fix typo in 1.6.6.2 release notes
Re-fix check-ref-format documentation mark-up
---

ca5812d2e3c72b09008422975740aff41a2c65a0
diff --combined Documentation/git-check-ref-format.txt
index a8c0b80613,7422185bf5..e1c4320f02
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt
@@@ -43,7 -43,7 +43,7 @@@ imposes the following rules on how refe
  
  . They cannot contain a sequence `@{`.
  
- . They cannot contain a `\\`.
+ . They cannot contain a `\`.
  
  These rules make it easy for shell script based tools to parse
  reference names, pathname expansion by the shell when a reference name is used
@@@ -60,7 -60,7 +60,7 @@@ reference name expressions (see linkgit
  . A colon `:` is used as in `srcref:dstref` to mean "use srcref\'s
    value and store it in dstref" in fetch and push operations.
    It may also be used to select a specific object such as with
 -  'git-cat-file': "git cat-file blob v1.3.3:refs.c".
 +  'git cat-file': "git cat-file blob v1.3.3:refs.c".
  
  . at-open-brace `@{` is used as a notation to access a reflog entry.