Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions en/basic.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
== Basic Tricks ==

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

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

$ git checkout 82f5

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.
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.

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

Expand Down
2 changes: 1 addition & 1 deletion en/branch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ With this magic word, the files in your directory suddenly shapeshift from one v

=== The Boss Key ===

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?
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?

In some directory:

Expand Down
2 changes: 1 addition & 1 deletion en/clone.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Start the Git daemon if necessary:

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

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

'Push' your project to the central server with:
Expand Down
2 changes: 1 addition & 1 deletion en/drawbacks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ The current implementation of Git, rather than its design, is to blame for this

=== Initial Commit ===

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.
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.

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.

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

Some developers strongly feel history should be immutable, warts and all.
Others feel trees should be made presentable before they are unleashed in
Expand Down
2 changes: 1 addition & 1 deletion en/multiplayer.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Now you can publish your latest edits via SSH from any clone:

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

and anybody can get your project with:
and anyone can get your project with:

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

Expand Down
2 changes: 1 addition & 1 deletion en/preface.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ August 2007

== Preface ==

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.
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.

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.

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

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