summaryrefslogtreecommitdiff
path: root/Documentation/revisions.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-12 13:54:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-12 13:54:01 -0700
commitcaa7d79f1f7c9940acfaf161b9b84bbf81980d95 (patch)
treebbfbe6ac84575766b4752e48960d12288a8b6c42 /Documentation/revisions.txt
parentMerge branch 'maint' (diff)
parentMerge branch 'rr/test-3200-style' into maint (diff)
downloadtgif-caa7d79f1f7c9940acfaf161b9b84bbf81980d95.tar.xz
Sync with 'maint'
* maint: Correct common spelling mistakes in comments and tests kwset: fix spelling in comments precompose-utf8: fix spelling of "want" in error message compat/nedmalloc: fix spelling in comments compat/regex: fix spelling and grammar in comments obstack: fix spelling of similar contrib/subtree: fix spelling of accidentally git-remote-mediawiki: spelling fixes doc: various spelling fixes fast-export: fix argument name in error messages Documentation: distinguish between ref and offset deltas in pack-format i18n: make the translation of -u advice in one go
Diffstat (limited to 'Documentation/revisions.txt')
-rw-r--r--Documentation/revisions.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 1707d451b6..8855b1a0ac 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -55,7 +55,7 @@ when you run `git cherry-pick`.
+
Note that any of the 'refs/*' cases above may come either from
the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' 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.
'<refname>@\{<date>\}', e.g. 'master@\{yesterday\}', 'HEAD@\{5 minutes ago\}'::