summaryrefslogtreecommitdiffstats
path: root/git-rev-parse.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-12 14:33:01 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-12 14:33:01 -0700
commita080bc385ebc70fc11db4081c1acc40b529f421f (patch)
tree1b4e8448c7171b2b642f3da41188a65e30367f00 /git-rev-parse.html
parent0eb115024d67a8c849fedcbee89005ed62b0cf08 (diff)
downloadgit-htmldocs-a080bc385ebc70fc11db4081c1acc40b529f421f.tar.gz
Autogenerated HTML docs for v1.8.2.1-389-gcaa7d7
Diffstat (limited to 'git-rev-parse.html')
-rw-r--r--git-rev-parse.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html
index cf5e7974e..61773caa2 100644
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -1209,7 +1209,7 @@ when you run <code>git merge</code>.
when you run <code>git cherry-pick</code>.</p></div>
<div class="paragraph"><p>Note that any of the <em>refs/*</em> cases above may come either from
the <em>$GIT_DIR/refs</em> directory or from the <em>$GIT_DIR/packed-refs</em> file.
-While the ref name encoding is unspecified, UTF-8 is prefered as
+While the ref name encoding is unspecified, UTF-8 is preferred as
some output processing may assume ref names in UTF-8.</p></div>
</li>
</ol></div>