summaryrefslogtreecommitdiff
path: root/Documentation/gittutorial.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-05 16:10:52 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-05 16:10:52 -0800
commite9b852310ebc271bdd71bb3b980e77325ad7f75f (patch)
tree759df44de42df45f2d498e179468c38c9cb11825 /Documentation/gittutorial.txt
parentremove trailing LF in die() messages (diff)
parentBe consistent in switch usage for tar (diff)
downloadtgif-e9b852310ebc271bdd71bb3b980e77325ad7f75f.tar.xz
Merge branch 'maint'
* maint: Be consistent in switch usage for tar Use capitalized names where appropriate fast-export: print usage when no options specified
Diffstat (limited to 'Documentation/gittutorial.txt')
-rw-r--r--Documentation/gittutorial.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 7892244ef1..458fafdb2c 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -590,7 +590,7 @@ list. When the history has lines of development that diverged and
then merged back together, the order in which 'git-log' presents
those commits is meaningless.
-Most projects with multiple contributors (such as the linux kernel,
+Most projects with multiple contributors (such as the Linux kernel,
or git itself) have frequent merges, and 'gitk' does a better job of
visualizing their history. For example,
@@ -642,7 +642,7 @@ digressions that may be interesting at this point are:
* linkgit:git-format-patch[1], linkgit:git-am[1]: These convert
series of git commits into emailed patches, and vice versa,
- useful for projects such as the linux kernel which rely heavily
+ useful for projects such as the Linux kernel which rely heavily
on emailed patches.
* linkgit:git-bisect[1]: When there is a regression in your