Skip to content

Commit

Permalink
Use capitalized names where appropriate
Browse files Browse the repository at this point in the history
The Linux kernel and Emacs are both spelled capitalized

Signed-off-by: Henrik Austad <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
henrikau authored and gitster committed Jan 5, 2009
1 parent dcfdbdf commit c7719fb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Documentation/gittutorial.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Documentation/user-manual.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------------------------------------------

Expand Down Expand Up @@ -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:

Expand Down

0 comments on commit c7719fb

Please sign in to comment.