summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorHenrik Austad <henrik@austad.us>2009-01-05 15:25:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-05 20:04:02 (GMT)
commitc7719fbe46deae03578c4e19516b9567e98b9f04 (patch)
treee91e7d310f0b3bb032a359e4c4719144a68f8fb8 /Documentation/user-manual.txt
parentdcfdbdf08bbe102bd4806f3c92fb0e43f53a623a (diff)
downloadgit-c7719fbe46deae03578c4e19516b9567e98b9f04.zip
git-c7719fbe46deae03578c4e19516b9567e98b9f04.tar.gz
git-c7719fbe46deae03578c4e19516b9567e98b9f04.tar.bz2
Use capitalized names where appropriate
The Linux kernel and Emacs are both spelled capitalized Signed-off-by: Henrik Austad <henrik@austad.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index d4b1e90..5242a7e 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -59,7 +59,7 @@ project in mind, here are some interesting examples:
------------------------------------------------
# git itself (approx. 10MB download):
$ git clone git://git.kernel.org/pub/scm/git/git.git
- # the linux kernel (approx. 150MB download):
+ # the Linux kernel (approx. 150MB download):
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
------------------------------------------------
@@ -1340,7 +1340,7 @@ These will display all commits which exist only on HEAD or on
MERGE_HEAD, and which touch an unmerged file.
You may also use linkgit:git-mergetool[1], which lets you merge the
-unmerged files using external tools such as emacs or kdiff3.
+unmerged files using external tools such as Emacs or kdiff3.
Each time you resolve the conflicts in a file and update the index: