Merge remote-tracking branch 'origin/master' into chapter-3-polish

Conflicts:
	book/03-git-branching/1-git-branching.asc

Author: schacon

OUTLINE.txt

@@ -42,14 +42,6 @@
     * Limiting Log Output
     * Using a GUI to Visualize History
 2.4 Undoing Things
-    * Reset Demystified
-      * The Three Trees
-      * The Workflow
-      * The Role of Reset
-      * Reset With a Path
-      * A Fun Example
-      * Check It Out
-      * Summary
     * Changing Your Last Commit
     * Unstaging a Staged File
     * Unmodifying a Modified File
@@ -88,7 +80,7 @@
     * Topic Branches
 3.5 Remote Branches
     * Pushing
-    * Tracking Branches
+    * Tracking / Upstream Branches
     * Deleting Remote Branches
 3.6 Rebasing
     * The Basic Rebase
@@ -111,16 +103,7 @@
 4.4 Setting Up the Server
 4.5 Public Access
 4.6 GitWeb
-4.9 Git Daemon
-4.8 Gitolite
-    * Installing
-    * Customising the Install
-    * Config File and Access Control Rules
-    * Advanced Access Control with "deny" rules
-    * Restricting pushes by files changed
-    * Personal Branches
-    * "Wildcard" repositories
-    * Other Features
+4.7 Git Daemon
 4.X GitLab
 4.X Gerrit
 4.10 Other Hosting Options (bitbucket, stash, kiln, etc.)
@@ -198,14 +181,19 @@ X.X Summary
       * Double Dot
       * Multiple Points
       * Triple Dot
-6.2 Interactive Staging
-    * Staging and Unstaging Files
-    * Staging Patches
-6.3 Stashing
+6.3 Stashing and Cleaning
     * Stashing Your Work
     * Un-applying a Stash
     * Creating a Branch from a Stash
+    * Git Clean
 6.X Searching (git grep)
+6.2 Interactive Staging
+    * Staging and Unstaging Files
+    * Staging Patches
+6.X Git Reset
+    * The Three Trees of Git
+    * Reset with a path
+    * Reset vs Checkout
 6.4 Rewriting History
     * Changing the Last Commit
     * Changing Multiple Commit Messages

atlas.json

@@ -4,6 +4,7 @@
     "book/cover.html",
     "LICENSE.asc",
     "book/preface.asc",
+    "book/toc.asc",
     "book/01-introduction/1-introduction.asc",
     "book/02-git-basics/1-git-basics.asc",
     "book/03-git-branching/1-git-branching.asc",

book/01-introduction/1-introduction.asc

@@ -1,3 +1,4 @@
+[[_getting_started]]
 == Getting Started
 
 This chapter will be about getting started with Git.
@@ -34,7 +35,7 @@ RCS works by keeping patch sets (that is, the differences between files) in a sp
 
 The next major issue that people encounter is that they need to collaborate with developers on other systems.
 To deal with this problem, Centralized Version Control Systems (CVCSs) were developed.
-These systems, such as CVS, Subversion, and Perforce, have a single server that contains all the versioned files, and a number of clients that check out files from that central place. (((CVS)))(((Subversion)))(((Perforce))) 
+These systems, such as CVS, Subversion, and Perforce, have a single server that contains all the versioned files, and a number of clients that check out files from that central place. (((CVS)))(((Subversion)))(((Perforce)))
 For many years, this has been the standard for version control.
 
 .Centralized version control.
@@ -211,11 +212,11 @@ You can either install it as a package or via another installer, or download the
 ==== Installing on Linux(((Linux, installing)))
 
 If you want to install Git on Linux via a binary installer, you can generally do so through the basic package-management tool that comes with your distribution.
-If you’re on Fedora, you can use yum:
+If you’re on Fedora for example, you can use yum:
 
   $ yum install git
 
-Or if you’re on a Debian-based distribution like Ubuntu, try apt-get:
+If you’re on a Debian-based distribution like Ubuntu, try apt-get:
 
   $ apt-get install git
 
@@ -245,32 +246,11 @@ The most official build is available for download on the Git website.
 Just go to http://git-scm.com/download/win[] and the download will start automatically.
 Note that this is a project called Git for Windows (also called msysGit), which is separate from Git itself; for more information on it, go to http://msysgit.github.io/[].
 
-
 Another easy way to get Git installed is by installing GitHub for Windows.
 The installer includes a command line version of Git as well as the GUI.
 It also works well with Powershell, and sets up solid credential caching and sane CRLF settings.
 We'll learn more about those things a little later, but suffice it to say they're things you want.
 
-=== First-Time Git Setup
-
-Now that you have Git on your system, you’ll want to do a few things to customize your Git environment.
-You should have to do these things only once on any given computer; they’ll stick around between upgrades.
-You can also change them at any time by running through the commands again.
-
-Git comes with a tool called `git config` that lets you get and set configuration variables that control all aspects of how Git looks and operates.(((git, config)))
-These variables can be stored in three different places:
-
-1. `/etc/gitconfig` file: Contains values for every user on the system and all their repositories.
-  If you pass the option` --system` to `git config`, it reads and writes from this file specifically.
-2. `~/.gitconfig` or `~/.config/git/config` file: Specific to your user.
-  You can make Git read and write to this file specifically by passing the `--global` option.
-3. `config` file in the Git directory (that is, `.git/config`) of whatever repository you’re currently using: Specific to that single repository.
-
-Each level overrides values in the previous level, so values in `.git/config` trump those in `/etc/gitconfig`.
-
-On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (`C:\Users\$USER` for most people).
-It also still looks for `/etc/gitconfig`, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer.
-
 ==== Installing from Source
 
 Some people may instead find it useful to install Git from source, because you’ll get the most recent version.
@@ -302,27 +282,53 @@ After this is done, you can also get Git via Git itself for updates:
 
   $ git clone git://git.kernel.org/pub/scm/git/git.git
 
+
+=== First-Time Git Setup
+
+Now that you have Git on your system, you’ll want to do a few things to customize your Git environment.
+You should have to do these things only once on any given computer; they’ll stick around between upgrades.
+You can also change them at any time by running through the commands again.
+
+Git comes with a tool called `git config` that lets you get and set configuration variables that control all aspects of how Git looks and operates.(((git, config)))
+These variables can be stored in three different places:
+
+1. `/etc/gitconfig` file: Contains values for every user on the system and all their repositories.
+  If you pass the option` --system` to `git config`, it reads and writes from this file specifically.
+2. `~/.gitconfig` or `~/.config/git/config` file: Specific to your user.
+  You can make Git read and write to this file specifically by passing the `--global` option.
+3. `config` file in the Git directory (that is, `.git/config`) of whatever repository you’re currently using: Specific to that single repository.
+
+Each level overrides values in the previous level, so values in `.git/config` trump those in `/etc/gitconfig`.
+
+On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (`C:\Users\$USER` for most people).
+It also still looks for `/etc/gitconfig`, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer.
+
 ==== Your Identity
 
 The first thing you should do when you install Git is to set your user name and e-mail address.
-This is important because every Git commit uses this information, and it’s immutably baked into the commits you pass around:
+This is important because every Git commit uses this information, and it’s immutably baked into the commits you start creating:
 
   $ git config --global user.name "John Doe"
   $ git config --global user.email [email protected]
 
 Again, you need to do this only once if you pass the `--global` option, because then Git will always use that information for anything you do on that system.
 If you want to override this with a different name or e-mail address for specific projects, you can run the command without the `--global` option when you’re in that project.
 
-Many of the GUI tools will help you do this when you first run them as well.
+Many of the GUI tools will help you do this when you first run them.
 
 ==== Your Editor
 
 Now that your identity is set up, you can configure the default text editor that will be used when Git needs you to type in a message.
-By default, Git uses your system’s default editor, which is generally vi or Vim.
+If not configured, Git uses your system’s default editor, which is generally Vim.
 If you want to use a different text editor, such as Emacs, you can do the following:
 
   $ git config --global core.editor emacs
 
+[NOTE]
+====
+Vim and Emacs are popular text editors often used by developers on Unix based systems like Linux and Mac. If you are not familiar with either of these editors or are on a Windows system, you may need to search for instructions for how to set up your favorite editor with Git.
+====
+
 ==== Checking Your Settings
 
 If you want to check your settings, you can use the `git config --list` command to list all the settings Git can find at that point:
@@ -362,6 +368,6 @@ These channels are regularly filled with hundreds of people who are all very kno
 
 === Summary
 
-You should have a basic understanding of what Git is and how it’s different from the CVCS you may have been using.
+You should have a basic understanding of what Git is and how it’s different from the centralized version control system you may have previously been using.
 You should also now have a working version of Git on your system that’s set up with your personal identity.
 It’s now time to learn some Git basics.