summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.5.0.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-01 17:04:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-01 17:04:35 (GMT)
commitd3096d2ba68aa6814d531317433f1cdcd76ba55c (patch)
treebd4aee07adf43114a4501a2cb187ffc8629cfcc0 /Documentation/RelNotes/1.5.0.txt
parent26f20fa3fc5bc758260c3e99d8b962753f541995 (diff)
parent03670c8b2375062a5bcc50ce8891a4406fbc88e2 (diff)
downloadgit-d3096d2ba68aa6814d531317433f1cdcd76ba55c.zip
git-d3096d2ba68aa6814d531317433f1cdcd76ba55c.tar.gz
git-d3096d2ba68aa6814d531317433f1cdcd76ba55c.tar.bz2
Merge branch 'en/doc-typofix'
Docfix. * en/doc-typofix: Fix spelling errors in no-longer-updated-from-upstream modules multimail: fix a few simple spelling errors sha1dc: fix trivial comment spelling error Fix spelling errors in test commands Fix spelling errors in messages shown to users Fix spelling errors in names of tests Fix spelling errors in comments of testcases Fix spelling errors in code comments Fix spelling errors in documentation outside of Documentation/ Documentation: fix a bunch of typos, both old and new
Diffstat (limited to 'Documentation/RelNotes/1.5.0.txt')
-rw-r--r--Documentation/RelNotes/1.5.0.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.5.0.txt b/Documentation/RelNotes/1.5.0.txt
index daf4bdb..d6d42f3 100644
--- a/Documentation/RelNotes/1.5.0.txt
+++ b/Documentation/RelNotes/1.5.0.txt
@@ -251,7 +251,7 @@ Updates in v1.5.0 since v1.4.4 series
the repository when that happens.
-* Crufts removal
+* Cruft removal
- We used to say "old commits are retrievable using reflog and
'master@{yesterday}' syntax as long as you haven't run
@@ -379,7 +379,7 @@ Updates in v1.5.0 since v1.4.4 series
- The value of i18n.commitencoding in the originating
repository is recorded in the commit object on the "encoding"
header, if it is not UTF-8. git-log and friends notice this,
- and reencodes the message to the log output encoding when
+ and re-encodes the message to the log output encoding when
displaying, if they are different. The log output encoding
is determined by "git log --encoding=<encoding>",
i18n.logoutputencoding configuration, or i18n.commitencoding