Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  Fix typo in 1.6.6.2 release notes
  Re-fix check-ref-format documentation mark-up
  • Loading branch information
gitster committed Feb 12, 2010
2 parents 9b4c8b0 + 341d9a4 commit ca5812d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Documentation/RelNotes-1.6.6.2.txt
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-check-ref-format.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ca5812d

Please sign in to comment.