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
590590then merged back together, the order in which 'git-log' presents
591591those 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,
594594or git itself) have frequent merges, and 'gitk' does a better job of
595595visualizing 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
Original file line number Diff line number Diff 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
13401340MERGE_HEAD, and which touch an unmerged file.
13411341
13421342You 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
13451345Each time you resolve the conflicts in a file and update the index:
13461346
You can’t perform that action at this time.
0 commit comments