Merge branch 'maint'

* maint:
  Fix typo in 1.6.6.2 release notes
  Re-fix check-ref-format documentation mark-up
This commit is contained in:
Junio C Hamano 2010-02-12 15:40:59 -08:00
commit ca5812d2e3
2 changed files with 2 additions and 2 deletions

View file

@ -1,7 +1,7 @@
Git v1.6.6.2 Release Notes
==========================
Fixes since v1.6.6.2
Fixes since v1.6.6.1
--------------------
* recursive merge didn't correctly diagnose its own programming errors,

View file

@ -43,7 +43,7 @@ imposes the following rules on how references are named:
. 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