Skip to content

Commit ff31e66

Browse files
committed
Fix typos.
1 parent 112815e commit ff31e66

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

en/basic.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
== Basic Tricks ==
22

33
Rather than diving into a sea of Git commands, use these elementary examples to
4-
get your feet wet. Despite their simplicity, each of them are useful.
4+
get your feet wet. Despite their simplicity, each of them is useful.
55
Indeed, in my first months with Git I never ventured beyond the material in this chapter.
66

77
=== Saving State ===
@@ -71,7 +71,7 @@ Other times you want to hop to an old state briefly. In this case, type:
7171

7272
$ git checkout 82f5
7373

74-
This takes you back in time, while preserving newer commits. However, like time travel in a science-fiction movie, if you now edit and commit, you will be in an alternate reality, because your actions are different to what they were the first time around.
74+
This takes you back in time, while preserving newer commits. However, like time travel in a science-fiction movie, if you now edit and commit, you will be in an alternate reality, because your actions are different from what they were the first time around.
7575

7676
This alternate reality is called a 'branch', and <<branch,we'll have more to say about this later>>. For now, just remember that
7777

en/branch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ With this magic word, the files in your directory suddenly shapeshift from one v
1616

1717
=== The Boss Key ===
1818

19-
Ever played one of those games where at the push of a button (``the boss key''), the screen would instantly display a spreadsheet or something? So if the boss walked in the office while you were playing the game you could quickly hide it away?
19+
Ever played one of those games where at the push of a button (``the boss key''), the screen would instantly display a spreadsheet or something? So if the boss walked into the office while you were playing the game you could quickly hide it away?
2020

2121
In some directory:
2222

en/clone.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Start the Git daemon if necessary:
3838

3939
$ git daemon --detach # it may already be running
4040

41-
For Git hosting services, follow the instructions to setup the initially
41+
For Git hosting services, follow the instructions to set up the initially
4242
empty Git repository. Typically one fills in a form on a webpage.
4343

4444
'Push' your project to the central server with:

en/drawbacks.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ The current implementation of Git, rather than its design, is to blame for this
8080

8181
=== Initial Commit ===
8282

83-
A stereotypical computer scientist counts from 0, rather than 1. Unfortunately, with respect to commits, git does not adhere to this convention. Many commands are unfriendly before the initial commit. Additionally, some corner cases must be handled specially, such as rebasing a branch with a different initial commit.
83+
A stereotypical computer scientist counts from 0, rather than 1. Unfortunately, with respect to commits, Git does not adhere to this convention. Many commands are unfriendly before the initial commit. Additionally, some corner cases must be handled specially, such as rebasing a branch with a different initial commit.
8484

8585
Git would benefit from defining the zero commit: as soon as a repository is constructed, HEAD would be set to the string consisting of 20 zero bytes. This special commit represents an empty tree, with no parent, at some time predating all Git repositories.
8686

en/history.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ A consequence of Git's distributed nature is that history can be edited
44
easily. But if you tamper with the past, take care: only rewrite that part of
55
history which you alone possess. Just as nations forever argue over who
66
committed what atrocity, if someone else has a clone whose version of history
7-
differs to yours, you will have trouble reconciling when your trees interact.
7+
differs from yours, you will have trouble reconciling when your trees interact.
88

99
Some developers strongly feel history should be immutable, warts and all.
1010
Others feel trees should be made presentable before they are unleashed in

en/multiplayer.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Now you can publish your latest edits via SSH from any clone:
4141

4242
$ git push web.server:/path/to/proj.git master
4343

44-
and anybody can get your project with:
44+
and anyone can get your project with:
4545

4646
$ git clone http://web.server/proj.git
4747

en/preface.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ August 2007
44

55
== Preface ==
66

7-
http://git-scm.com/[Git] is a version control Swiss army knife. A reliable versatile multipurpose revision control tool whose extraordinary flexibility makes it tricky to learn, let alone master.
7+
http://git-scm.com/[Git] is a version control Swiss army knife. A reliable, versatile, multipurpose revision control tool whose extraordinary flexibility makes it tricky to learn, let alone master.
88

99
As Arthur C. Clarke observed, any sufficiently advanced technology is indistinguishable from magic. This is a great way to approach Git: newbies can ignore its inner workings and view Git as a gizmo that can amaze friends and infuriate enemies with its wondrous abilities.
1010

en/translate.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Clone the source, then create a directory corresponding to the target
88
language's IETF tag: see
99
http://www.w3.org/International/articles/language-tags/Overview.en.php[the W3C
1010
article on internationalization]. For example, English is "en" and Japanese is
11-
"ja". In the new directory, and translate the +txt+ files from the "en"
11+
"ja". In the new directory, translate the +txt+ files from the "en"
1212
subdirectory.
1313

1414
For instance, to translate the guide into http://en.wikipedia.org/wiki/Klingon_language[Klingon], you might type:

0 commit comments

Comments
 (0)