Skip to content

Commit c7719fb

Browse files
henrikaugitster
authored andcommitted
Use capitalized names where appropriate
The Linux kernel and Emacs are both spelled capitalized Signed-off-by: Henrik Austad <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent dcfdbdf commit c7719fb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Documentation/gittutorial.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ list. When the history has lines of development that diverged and
590590
then merged back together, the order in which 'git-log' presents
591591
those commits is meaningless.
592592

593-
Most projects with multiple contributors (such as the linux kernel,
593+
Most projects with multiple contributors (such as the Linux kernel,
594594
or git itself) have frequent merges, and 'gitk' does a better job of
595595
visualizing their history. For example,
596596

@@ -642,7 +642,7 @@ digressions that may be interesting at this point are:
642642

643643
* linkgit:git-format-patch[1], linkgit:git-am[1]: These convert
644644
series of git commits into emailed patches, and vice versa,
645-
useful for projects such as the linux kernel which rely heavily
645+
useful for projects such as the Linux kernel which rely heavily
646646
on emailed patches.
647647

648648
* linkgit:git-bisect[1]: When there is a regression in your

Documentation/user-manual.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ project in mind, here are some interesting examples:
5959
------------------------------------------------
6060
# git itself (approx. 10MB download):
6161
$ git clone git://git.kernel.org/pub/scm/git/git.git
62-
# the linux kernel (approx. 150MB download):
62+
# the Linux kernel (approx. 150MB download):
6363
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
6464
------------------------------------------------
6565

@@ -1340,7 +1340,7 @@ These will display all commits which exist only on HEAD or on
13401340
MERGE_HEAD, and which touch an unmerged file.
13411341

13421342
You may also use linkgit:git-mergetool[1], which lets you merge the
1343-
unmerged files using external tools such as emacs or kdiff3.
1343+
unmerged files using external tools such as Emacs or kdiff3.
13441344

13451345
Each time you resolve the conflicts in a file and update the index:
13461346

0 commit comments

Comments
 (0)