From 12f67f96f90ad43f70df00fca1424570b9881426 Mon Sep 17 00:00:00 2001 From: Ben Lynn Date: Sun, 13 Apr 2008 23:49:01 -0700 Subject: [PATCH] Applied suggestions from Douglas Livingstone. --- basic.txt | 6 +++--- branch.txt | 2 +- grandmaster.txt | 4 ++-- preface.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/basic.txt b/basic.txt index 55a4640..ba45c5c 100644 --- a/basic.txt +++ b/basic.txt @@ -68,11 +68,11 @@ Using *git checkout* is a third way to load an old state, but it's slightly more To take the computer game analogy again: -- *git revert* is like loading a game and recording this fact as a new saved game, +- *`git revert`*: load a game and record this fact as a new saved game. -- *git reset --hard* is like loading an old save and deleting all saved games newer than the one just loaded, and +- *`git reset \--hard`*: load an old save and delete all saved games newer than the one just loaded. -- *git checkout* is like loading an old game, but if you play on, the game state will deviate from the newer saves you made the first time around. Any saved games you make now will end up in a separate branch representing the alternate reality you have entered. We describe how to deal with this later. +- *`git checkout`*: load an old game, but if you play on, the game state will deviate from the newer saves you made the first time around. Any saved games you make now will end up in a separate branch representing the alternate reality you have entered. We describe how to deal with this later. For reset and checkout, you can choose only to restore particular files and subdirectories by appending them after the command. diff --git a/branch.txt b/branch.txt index 3d25c7f..30e3f31 100644 --- a/branch.txt +++ b/branch.txt @@ -148,4 +148,4 @@ Often I have a flaky internet connection. I didn't mind too much with Git but fo I found myself conditioned to avoid certain commands because of the latencies involved, which ultimately prevented me from following the work flow I wanted. -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 communcation to complete, I'd do something else to pass the time, such as check email or write documentation. By the time I returned to the original task, the command had already finished long ago. I'd have to spend a long time trying to remember what I was doing. +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 communcation to complete, I'd do something else to pass the time, such as check email or write documentation. By the time I returned to the original task, the command had already finished long ago. I would then spend a long time trying to remember what I was doing. diff --git a/grandmaster.txt b/grandmaster.txt index dbcfc63..ffbf0cc 100644 --- a/grandmaster.txt +++ b/grandmaster.txt @@ -82,7 +82,7 @@ Then: - Replace "pick" with "edit" to mark a commit for amending. - Replace "pick" with "squash" to merge a commit with the previous one. -Next run *git commit --amend* if you marked a commit for editing. Otherwise, run: +Next run *git commit \--amend* if you marked a commit for editing. Otherwise, run: $ git rebase --continue @@ -96,7 +96,7 @@ then you sync with the official tree with a merge. This cycle repeats itself a f But now the history in your local Git clone is a messy jumble of your changes and the official changes. You'd prefer to see all your changes in one contiguous section, and after all the official changes. This is a job for *git rebase* as described above. In many cases you can use -the *--onto* flag and avoid interaction. +the *\--onto* flag and avoid interaction. Also see the manpage for other amazing uses of this command, which really deserves a chapter of its own. You can split commits. You can even rearrange branches of a tree! diff --git a/preface.txt b/preface.txt index fe00e15..8fef08d 100644 --- a/preface.txt +++ b/preface.txt @@ -12,7 +12,7 @@ Rather than go into details, I'll provide rough instructions for particular effe .Thanks! -Thanks to Dustin Sallings, Alberto Bertogli, and Douglas Livingstone for suggestions and improvements. [If you're name should be here, and it isn't, please tell me because I often forget to update this section.] +Kudos to Dustin Sallings, Alberto Bertogli, and Douglas Livingstone for suggestions and improvements. [If I've left you out, please tell me because I often forget to update this section.] .About Git -- 2.11.4.GIT