From 0a005ab8b1ec0f965c2489d4797d75c0c91c9df4 Mon Sep 17 00:00:00 2001 From: Ben Lynn Date: Sun, 15 Nov 2009 15:22:51 -0800 Subject: [PATCH] =?utf8?q?Fixes=20thanks=20to=20S=C3=A9bastien=20Hinderer.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Minor edits. --- en/basic.txt | 3 ++- en/branch.txt | 13 ++++++------- en/history.txt | 14 +++++++------- en/multiplayer.txt | 2 +- en/preface.txt | 4 ++-- en/secrets.txt | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/en/basic.txt b/en/basic.txt index 2046bfe..446d78e 100644 --- a/en/basic.txt +++ b/en/basic.txt @@ -90,7 +90,8 @@ In a court of law, events can be stricken from the record. Likewise, you can pic $ git commit -a $ git revert SHA1_HASH -will undo just the commit with the given hash. Running *git log* reveals the revert is recorded as a new commit. +will undo just the commit with the given hash. The revert is recorded as a new +commit, which you can confirm by running *git log*. === Changelog Generation === diff --git a/en/branch.txt b/en/branch.txt index 95deab9..41a6cf1 100644 --- a/en/branch.txt +++ b/en/branch.txt @@ -113,7 +113,7 @@ If you're lucky, or very good, you can skip these lines. Eventually, Part I is approved: $ git checkout master # Go back to Part I. - $ some_command # Maybe you're supposed to run something when the + $ some_command # Some command you're supposed to run when the # current working directory is officially ready. $ git merge part2 # Merge in Part II. $ git branch -d part2 @@ -150,9 +150,8 @@ List all branches by typing: $ git branch -There is always a branch named "master", and you start here by default. Some -advocate leaving the "master" branch untouched and creating new branches for -your own edits. +By default, you start in a branch named "master". Some advocate leaving the +"master" branch untouched and creating new branches for your own edits. The *-d* and *-m* options allow you to delete and move (rename) branches. See *git help branch*. @@ -190,9 +189,9 @@ You can have multiple stashes, and manipulate them in various ways. See Applications such as http://www.mozilla.com/[Mozilla Firefox] allow you to open multiple tabs and multiple windows. Switching tabs gives you different content in the same window. Git branching is like tabs for your working directory. Continuing this analogy, Git cloning is like opening a new window. Being able to do both improves the user experience. -On a higher level, several Linux window managers support multiple desktops. -Branching in Git is similar to switching to a different desktop, while cloning -is similar to attaching another monitor to gain another desktop. +On a higher level, several window managers support multiple desktops. Branching +in Git is similar to switching to a different desktop, while cloning is similar +to attaching another monitor to gain another desktop. Yet another example is the http://www.gnu.org/software/screen/[*screen*] utility. This gem lets you create, destroy and switch between multiple terminal sessions in the same terminal. Instead of opening new terminals (clone), you can use the same one if you run *screen* (branch). In fact, you can do a lot more with *screen* but that's a topic for another text. diff --git a/en/history.txt b/en/history.txt index 4552cf0..d17f577 100644 --- a/en/history.txt +++ b/en/history.txt @@ -6,8 +6,8 @@ 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. -Of course, if you control all the other trees too, then there is no problem -since you can overwrite them. +Of course, if you control all the other trees too, you can simply overwrite +them. Some developers strongly feel history should be immutable, warts and all. Others feel trees should be made presentable before they are unleashed in @@ -216,11 +216,11 @@ granted. I simply assumed other systems were similar: choosing a version control system ought to be no different from choosing a text editor or web browser. -I was shocked when later forced to use a centralized system. My often flaky -internet connection matters little with Git, but makes development unbearable -when it needs to be as reliable as local disk. Additionally, I found myself -conditioned to avoid certain commands because of the latencies involved, which -ultimately prevented me from following my desired work flow. +I was shocked when later forced to use a centralized system. A flaky internet +connection matters little with Git, but makes development unbearable when it +needs to be as reliable as local disk. Additionally, I found myself conditioned +to avoid certain commands because of the latencies involved, which ultimately +prevented me from following my desired work flow. When I had to run a slow command, the interruption to my train of thought dealt a disproportionate amount of damage. While waiting for server diff --git a/en/multiplayer.txt b/en/multiplayer.txt index 73bf2f2..f24d8fa 100644 --- a/en/multiplayer.txt +++ b/en/multiplayer.txt @@ -136,7 +136,7 @@ The +remote.origin.url+ option controls the source URL; "origin" is a nickname given to the source repository. As with the "master" branch convention, we may change or delete this nickname but there is usually no reason for doing so. -If the the original repository moves, we can update the URL via: +If the original repository moves, we can update the URL via: $ git config remote.origin.url NEW_URL diff --git a/en/preface.txt b/en/preface.txt index 1aa8892..d0e2255 100644 --- a/en/preface.txt +++ b/en/preface.txt @@ -26,8 +26,8 @@ Rather than go into details, we provide rough instructions for particular effect Dustin Sallings, Alberto Bertogli, James Cameron, Douglas Livingstone, Michael Budde, Richard Albury, Tarmigan, Derek Mahar, Frode Aannevik, Keith -Rarick, Andy Somerville, Ralf Recker, Øyvind A. Holm, and Miklos Vajna -contributed corrections and improvements. +Rarick, Andy Somerville, Ralf Recker, Øyvind A. Holm, Miklos Vajna, +Sébastien Hinderer contributed corrections and improvements. Francois Marier maintains the Debian package originally created by Daniel Baumann. diff --git a/en/secrets.txt b/en/secrets.txt index 2ffff9f..b167cfb 100644 --- a/en/secrets.txt +++ b/en/secrets.txt @@ -30,7 +30,7 @@ Git heuristically ferrets out renames and copies between successive versions. In === Indexing === -For every tracked file, Git records information such as its size, creation time and last modification time in a file known as the 'index'. To determine whether a file has changed, Git compares its current stats with that held the index. If they match, then Git can skip reading the file again. +For every tracked file, Git records information such as its size, creation time and last modification time in a file known as the 'index'. To determine whether a file has changed, Git compares its current stats with that held in the index. If they match, then Git can skip reading the file again. Since stat calls are considerably faster than file reads, if you only edit a few files, Git can update its state in almost no time. -- 2.11.4.GIT