diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:49 -0800 |
| commit | add0951ab0bee43b5f634d1be68a7a80f627c18f (patch) | |
| tree | 084fe451a6b0c7d68d8d16c4ea9f64c38d9e01b0 /Documentation/git-check-ref-format.txt | |
| parent | 5fc9df08b564aa9d11265ad591f9ef104695ce2b (diff) | |
| parent | 0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63 (diff) | |
| download | git-add0951ab0bee43b5f634d1be68a7a80f627c18f.tar.gz | |
Merge remote branch 'remotes/trast-doc/for-next'
* remotes/trast-doc/for-next:
Documentation: spell 'git cmd' without dash throughout
Documentation: format full commands in typewriter font
Documentation: warn prominently against merging with dirty trees
Documentation/git-merge: reword references to "remote" and "pull"
Conflicts:
Documentation/config.txt
Documentation/git-config.txt
Documentation/git-merge.txt
Diffstat (limited to 'Documentation/git-check-ref-format.txt')
| -rw-r--r-- | Documentation/git-check-ref-format.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt index 0aeef24780..d9a3326f58 100644 --- a/Documentation/git-check-ref-format.txt +++ b/Documentation/git-check-ref-format.txt @@ -60,7 +60,7 @@ reference name expressions (see linkgit:git-rev-parse[1]): . 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. |