File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -590,7 +590,7 @@ list. When the history has lines of development that diverged and
590
590
then merged back together, the order in which 'git-log' presents
591
591
those commits is meaningless.
592
592
593
- Most projects with multiple contributors (such as the linux kernel,
593
+ Most projects with multiple contributors (such as the Linux kernel,
594
594
or git itself) have frequent merges, and 'gitk' does a better job of
595
595
visualizing their history. For example,
596
596
@@ -642,7 +642,7 @@ digressions that may be interesting at this point are:
642
642
643
643
* linkgit:git-format-patch[1], linkgit:git-am[1]: These convert
644
644
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
646
646
on emailed patches.
647
647
648
648
* linkgit:git-bisect[1]: When there is a regression in your
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ project in mind, here are some interesting examples:
59
59
------------------------------------------------
60
60
# git itself (approx. 10MB download):
61
61
$ 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):
63
63
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
64
64
------------------------------------------------
65
65
@@ -1340,7 +1340,7 @@ These will display all commits which exist only on HEAD or on
1340
1340
MERGE_HEAD, and which touch an unmerged file.
1341
1341
1342
1342
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.
1344
1344
1345
1345
Each time you resolve the conflicts in a file and update the index:
1346
1346
You can’t perform that action at this time.
0 commit comments