aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-quiltimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-05 16:13:32 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-05 16:13:32 -0800
commite34c7e2b51c02a761a034b877b852dc0dbccf101 (patch)
tree2c80451e27d6fda5c0745270fee17da9e7bc2d1e /Documentation/git-quiltimport.txt
parent6d81ce0543c2fb7177c08491ba31a69aa54b7930 (diff)
parentafeef30c34116ddc4a091d497f5ac8f4cdde7c65 (diff)
downloadgit-e34c7e2b51c02a761a034b877b852dc0dbccf101.tar.gz
git-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/git-quiltimport.txt')
-rw-r--r--Documentation/git-quiltimport.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt
index 7f112f3dc..a35619658 100644
--- a/Documentation/git-quiltimport.txt
+++ b/Documentation/git-quiltimport.txt
@@ -14,7 +14,7 @@ SYNOPSIS
DESCRIPTION
-----------
-Applies a quilt patchset onto the current git branch, preserving
+Applies a quilt patchset onto the current Git branch, preserving
the patch boundaries, patch order, and patch descriptions present
in the quilt patchset.
@@ -25,7 +25,7 @@ the patch description is displayed and the user is asked to
interactively enter the author of the patch.
If a subject is not found in the patch description the patch name is
-preserved as the 1 line subject in the git description.
+preserved as the 1 line subject in the Git description.
OPTIONS
-------