summaryrefslogtreecommitdiff
path: root/Documentation/gitdiffcore.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-05 16:13:32 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-05 16:13:32 -0800
commite34c7e2b51c02a761a034b877b852dc0dbccf101 (patch)
tree2c80451e27d6fda5c0745270fee17da9e7bc2d1e /Documentation/gitdiffcore.txt
parentMerge branch 'jc/fake-ancestor-with-non-blobs' (diff)
parentDocumentation: StGit is the right spelling, not StGIT (diff)
downloadtgif-e34c7e2b51c02a761a034b877b852dc0dbccf101.tar.xz
Merge branch 'ta/doc-no-small-caps'
Update documentation to change "GIT" which was a poor-man's small caps to "Git". The latter was the intended spelling. Also change "git" spelled in all-lowercase to "Git" when it refers to the system as the whole or the concept it embodies, as opposed to the command the end users would type. * ta/doc-no-small-caps: Documentation: StGit is the right spelling, not StGIT Documentation: describe the "repository" in repository-layout Documentation: add a description for 'gitfile' to glossary Documentation: do not use undefined terms git-dir and git-file Documentation: the name of the system is 'Git', not 'git' Documentation: avoid poor-man's small caps GIT
Diffstat (limited to 'Documentation/gitdiffcore.txt')
-rw-r--r--Documentation/gitdiffcore.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index daf1782a31..4ed71c76cb 100644
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -254,7 +254,7 @@ pattern. Filepairs that match a glob pattern on an earlier line
in the file are output before ones that match a later line, and
filepairs that do not match any glob pattern are output last.
-As an example, a typical orderfile for the core git probably
+As an example, a typical orderfile for the core Git probably
would look like this:
------------------------------------------------