Commit: 2742188a9bc84bcfc634282b3297de3897041f79 - mytools (git)

Commit MetaInfo

• Revision: 2742188a9bc84bcfc634282b3297de3897041f79 (tree)
• Time: 2020-10-25 11:08:11
• Author: matsuand <30614168+matsuand@user...>
• Commiter: matsuand

Log Message

日本語訳段落に続いた正規のオリジナル文への対処(includeのみへの対処)。20201025結果修正。

Change Summary

• modified: progit2ja_diff/20201025.result.txt
• modified: progit2ja_diff/progit2ja_diff.perl

Incremental Difference

--- a/progit2ja_diff/20201025.result.txt
+++ b/progit2ja_diff/20201025.result.txt
@@ -1,3720 +1,3710 @@
-diff -au ../../git/progit2/progit2/A-git-in-other-environments.asc /tmp/A-git-in-other-environments.asc.tmp
---- ../../git/progit2/progit2/A-git-in-other-environments.asc	2020-08-29 09:58:24.046195489 +0900
-+++ /tmp/A-git-in-other-environments.asc.tmp	2020-10-25 09:24:25.507959693 +0900
+diff -au /tmp/A-git-in-other-environments.asc.tmp ../../git/progit2/progit2/A-git-in-other-environments.asc
+--- /tmp/A-git-in-other-environments.asc.tmp	2020-10-25 11:05:02.074629892 +0900
++++ ../../git/progit2/progit2/A-git-in-other-environments.asc	2020-08-29 09:58:24.046195489 +0900
 @@ -1,4 +1,4 @@
--[[A-git-in-other-environments]]
-+[#A-git-in-other-environments]
+-[#A-git-in-other-environments]
++[[A-git-in-other-environments]]
  [appendix]
  == Git in Other Environments
  
-@@ -7,22 +7,6 @@
- But the story doesn't end there; Git is usually used as part of a larger ecosystem, and the terminal isn't always the best way to work with it.
- Now we'll take a look at some of the other kinds of environments where Git can be useful, and how other applications (including yours) work alongside Git.
+@@ -11,7 +11,11 @@
  
--include::book/A-git-in-other-environments/sections/guis.asc[]
--
--include::book/A-git-in-other-environments/sections/visualstudio.asc[]
--
--include::book/A-git-in-other-environments/sections/visualstudiocode.asc[]
--
--include::book/A-git-in-other-environments/sections/jetbrainsides.asc[]
--
--include::book/A-git-in-other-environments/sections/sublimetext.asc[]
--
--include::book/A-git-in-other-environments/sections/bash.asc[]
--
--include::book/A-git-in-other-environments/sections/zsh.asc[]
--
--include::book/A-git-in-other-environments/sections/powershell.asc[]
--
- === Summary
+ include::book/A-git-in-other-environments/sections/visualstudio.asc[]
+ 
+-include::book/A-git-in-other-environments/sections/eclipse.asc[]
++include::book/A-git-in-other-environments/sections/visualstudiocode.asc[]
++
++include::book/A-git-in-other-environments/sections/jetbrainsides.asc[]
++
++include::book/A-git-in-other-environments/sections/sublimetext.asc[]
+ 
+ include::book/A-git-in-other-environments/sections/bash.asc[]
  
- You've learned how to harness Git's power from inside the tools that you use during your everyday work, and also how to access Git repositories from your own programs.
 Warning: file not found: ../../git/progit2/progit2-ja/B-embedding-git-in-your-applications.asc
-diff -au ../../git/progit2/progit2/C-git-commands.asc /tmp/C-git-commands.asc.tmp
---- ../../git/progit2/progit2/C-git-commands.asc	2020-08-17 16:38:51.074694961 +0900
-+++ /tmp/C-git-commands.asc.tmp	2020-10-25 09:24:25.545961483 +0900
+diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.asc
+--- /tmp/C-git-commands.asc.tmp	2020-10-25 11:05:02.082630342 +0900
++++ ../../git/progit2/progit2/C-git-commands.asc	2020-08-17 16:38:51.074694961 +0900
 @@ -1,4 +1,4 @@
--[[C-git-commands]]
-+[#C-git-commands]
+-[#C-git-commands]
++[[C-git-commands]]
  [appendix]
  == Git Commands
  
-@@ -8,20 +8,10 @@
+@@ -8,10 +8,20 @@
  In this appendix, we'll go through all the Git commands we addressed throughout the book, grouped roughly by what they're used for.
  We'll talk about what each command very generally does and then point out where in the book you can find us having used it.
  
--[TIP]
--====
--You can abbreviate long options.
--For example, you can type in `git commit --a`, which acts as if you typed `git commit --amend`.
--This only works when the letters after `--` are unique for one option.
--Do use the full option when writing scripts.
--====
--
++[TIP]
++====
++You can abbreviate long options.
++For example, you can type in `git commit --a`, which acts as if you typed `git commit --amend`.
++This only works when the letters after `--` are unique for one option.
++Do use the full option when writing scripts.
++====
++
  === Setup and Config
  
  There are two commands that are used quite a lot, from the first invocations of Git to common every day tweaking and referencing, the `config` and `help` commands.
  
--==== git config
--
++==== git config
++
  Git has a default way of doing hundreds of things.
  For a lot of these things, you can tell Git to default to doing them a different way, or set your preferences.
  This involves everything from telling Git what your name is to specific terminal color preferences or what editor you use.
-@@ -29,251 +19,178 @@
+@@ -19,178 +29,251 @@
  
  The `git config` command has been used in nearly every chapter of the book.
  
--In <<ch01-getting-started#_first_time>> we used it to specify our name, email address and editor preference before we even got started using Git.
-+In <<ch01-introduction#r_first_time>> we used it to specify our name, email address and editor preference before we even got started using Git.
+-In <<ch01-introduction#r_first_time>> we used it to specify our name, email address and editor preference before we even got started using Git.
++In <<ch01-getting-started#_first_time>> we used it to specify our name, email address and editor preference before we even got started using Git.
  
--In <<ch02-git-basics-chapter#_git_aliases>> we showed how you could use it to create shorthand commands that expand to long option sequences so you don't have to type them every time.
-+In <<ch02-git-basics#r_git_aliases>> we showed how you could use it to create shorthand commands that expand to long option sequences so you don't have to type them every time.
+-In <<ch02-git-basics#r_git_aliases>> we showed how you could use it to create shorthand commands that expand to long option sequences so you don't have to type them every time.
++In <<ch02-git-basics-chapter#_git_aliases>> we showed how you could use it to create shorthand commands that expand to long option sequences so you don't have to type them every time.
  
--In <<ch03-git-branching#_rebasing>> we used it to make `--rebase` the default when you run `git pull`.
-+In <<ch03-git-branching#r_rebasing>> we used it to make `--rebase` the default when you run `git pull`.
+-In <<ch03-git-branching#r_rebasing>> we used it to make `--rebase` the default when you run `git pull`.
++In <<ch03-git-branching#_rebasing>> we used it to make `--rebase` the default when you run `git pull`.
  
--In <<ch07-git-tools#_credential_caching>> we used it to set up a default store for your HTTP passwords.
-+In <<ch07-git-tools#r_credential_caching>> we used it to set up a default store for your HTTP passwords.
+-In <<ch07-git-tools#r_credential_caching>> we used it to set up a default store for your HTTP passwords.
++In <<ch07-git-tools#_credential_caching>> we used it to set up a default store for your HTTP passwords.
  
--In <<ch08-customizing-git#_keyword_expansion>> we showed how to set up smudge and clean filters on content coming in and out of Git.
--
--Finally, basically the entirety of <<ch08-customizing-git#_git_config>> is dedicated to the command.
--
--[[_core_editor]]
--==== git config core.editor commands
--
--Accompanying the configuration instructions in <<ch01-getting-started#_editor>>, many editors can be set as follows:
--
--.Exhaustive list of `core.editor` configuration commands
--[cols="1,2",options="header"]
--|==============================
--|Editor | Configuration command
--|Atom |`git config --global core.editor "atom --wait"`
--|BBEdit (Mac, with command line tools) |`git config --global core.editor "bbedit -w"`
--|Emacs |`git config --global core.editor emacs`
--|Gedit (Linux) |`git config --global core.editor "gedit --wait --new-window"`
--|Gvim (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\Vim\vim72\gvim.exe' --nofork '%*'"` (Also see note below)
--|Kate (Linux) |`git config --global core.editor "kate"`
--|nano |`git config --global core.editor "nano -w"`
--|Notepad (Windows 64-bit) |`git config core.editor notepad`
--|Notepad++ (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\Notepad++\notepad++.exe' -multiInst -notabbar -nosession -noPlugin"` (Also see note below)
--|Scratch (Linux)|`git config --global core.editor "scratch-text-editor"`
--|Sublime Text (macOS) |`git config --global core.editor "/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl --new-window --wait"`
--|Sublime Text (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\Sublime Text 3\sublime_text.exe' -w"` (Also see note below)
--|TextEdit (macOS)|`git config --global --add core.editor "open -W -n"`
--|Textmate |`git config --global core.editor "mate -w"`
--|Textpad (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\TextPad 5\TextPad.exe' -m` (Also see note below)
--|UltraEdit (Windows 64-bit) | `git config --global core.editor Uedit32`
--|Vim |`git config --global core.editor "vim"`
--|Visual Studio Code |`git config --global core.editor "code --wait"`
--|VSCodium (Free/Libre Open Source Software Binaries of VSCode) | `git config --global core.editor "codium --wait"`
--|WordPad |`git config --global core.editor '"C:\Program Files\Windows NT\Accessories\wordpad.exe"'"`
--|Xi | `git config --global core.editor "xi --wait"`
--|==============================
--
--[NOTE]
--====
--If you have a 32-bit editor on a Windows 64-bit system, the program will be installed in `C:\Program Files (x86)\` rather than `C:\Program Files\` as in the table above.
--====
-+In <<ch08-customizing-git#r_keyword_expansion>> we showed how to set up smudge and clean filters on content coming in and out of Git.
+-In <<ch08-customizing-git#r_keyword_expansion>> we showed how to set up smudge and clean filters on content coming in and out of Git.
++In <<ch08-customizing-git#_keyword_expansion>> we showed how to set up smudge and clean filters on content coming in and out of Git.
++
++Finally, basically the entirety of <<ch08-customizing-git#_git_config>> is dedicated to the command.
++
++[[_core_editor]]
++==== git config core.editor commands
++
++Accompanying the configuration instructions in <<ch01-getting-started#_editor>>, many editors can be set as follows:
++
++.Exhaustive list of `core.editor` configuration commands
++[cols="1,2",options="header"]
++|==============================
++|Editor | Configuration command
++|Atom |`git config --global core.editor "atom --wait"`
++|BBEdit (Mac, with command line tools) |`git config --global core.editor "bbedit -w"`
++|Emacs |`git config --global core.editor emacs`
++|Gedit (Linux) |`git config --global core.editor "gedit --wait --new-window"`
++|Gvim (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\Vim\vim72\gvim.exe' --nofork '%*'"` (Also see note below)
++|Kate (Linux) |`git config --global core.editor "kate"`
++|nano |`git config --global core.editor "nano -w"`
++|Notepad (Windows 64-bit) |`git config core.editor notepad`
++|Notepad++ (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\Notepad++\notepad++.exe' -multiInst -notabbar -nosession -noPlugin"` (Also see note below)
++|Scratch (Linux)|`git config --global core.editor "scratch-text-editor"`
++|Sublime Text (macOS) |`git config --global core.editor "/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl --new-window --wait"`
++|Sublime Text (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\Sublime Text 3\sublime_text.exe' -w"` (Also see note below)
++|TextEdit (macOS)|`git config --global --add core.editor "open -W -n"`
++|Textmate |`git config --global core.editor "mate -w"`
++|Textpad (Windows 64-bit) |`git config --global core.editor "'C:\Program Files\TextPad 5\TextPad.exe' -m` (Also see note below)
++|UltraEdit (Windows 64-bit) | `git config --global core.editor Uedit32`
++|Vim |`git config --global core.editor "vim"`
++|Visual Studio Code |`git config --global core.editor "code --wait"`
++|VSCodium (Free/Libre Open Source Software Binaries of VSCode) | `git config --global core.editor "codium --wait"`
++|WordPad |`git config --global core.editor '"C:\Program Files\Windows NT\Accessories\wordpad.exe"'"`
++|Xi | `git config --global core.editor "xi --wait"`
++|==============================
++
++[NOTE]
++====
++If you have a 32-bit editor on a Windows 64-bit system, the program will be installed in `C:\Program Files (x86)\` rather than `C:\Program Files\` as in the table above.
++====
  
--==== git help
-+Finally, basically the entirety of <<ch08-customizing-git#r_git_config>> is dedicated to the command.
+-Finally, basically the entirety of <<ch08-customizing-git#r_git_config>> is dedicated to the command.
++==== git help
  
  The `git help` command is used to show you all the documentation shipped with Git about any command.
  While we're giving a rough overview of most of the more popular ones in this appendix, for a full listing of all of the possible options and flags for every command, you can always run `git help <command>`.
  
--We introduced the `git help` command in <<ch01-getting-started#_git_help>> and showed you how to use it to find more information about the `git shell` in <<ch04-git-on-the-server#_setting_up_server>>.
--
-+We introduced the `git help` command in <<ch01-introduction#r_git_help>> and showed you how to use it to find more information about the `git shell` in <<ch04-git-server#r_setting_up_server>>.
+-We introduced the `git help` command in <<ch01-introduction#r_git_help>> and showed you how to use it to find more information about the `git shell` in <<ch04-git-server#r_setting_up_server>>.
++We introduced the `git help` command in <<ch01-getting-started#_git_help>> and showed you how to use it to find more information about the `git shell` in <<ch04-git-on-the-server#_setting_up_server>>.
++
  
  === Getting and Creating Projects
  
  There are two ways to get a Git repository.
  One is to copy it from an existing repository on the network or elsewhere and the other is to create a new one in an existing directory.
  
--==== git init
--
++==== git init
++
  To take a directory and turn it into a new Git repository so you can start version controlling it, you can simply run `git init`.
  
--We first introduce this in <<ch02-git-basics-chapter#_getting_a_repo>>, where we show creating a brand new repository to start working with.
-+We first introduce this in <<ch02-git-basics#r_getting_a_repo>>, where we show creating a brand new repository to start working with.
+-We first introduce this in <<ch02-git-basics#r_getting_a_repo>>, where we show creating a brand new repository to start working with.
++We first introduce this in <<ch02-git-basics-chapter#_getting_a_repo>>, where we show creating a brand new repository to start working with.
  
--We talk briefly about how you can change the default branch name from ``master'' in <<ch03-git-branching#_remote_branches>>.
-+We talk briefly about how you can change the default branch from ``master'' in <<ch03-git-branching#r_remote_branches>>.
+-We talk briefly about how you can change the default branch from ``master'' in <<ch03-git-branching#r_remote_branches>>.
++We talk briefly about how you can change the default branch name from ``master'' in <<ch03-git-branching#_remote_branches>>.
  
--We use this command to create an empty bare repository for a server in <<ch04-git-on-the-server#_bare_repo>>.
-+We use this command to create an empty bare repository for a server in <<ch04-git-server#r_bare_repo>>.
+-We use this command to create an empty bare repository for a server in <<ch04-git-server#r_bare_repo>>.
++We use this command to create an empty bare repository for a server in <<ch04-git-on-the-server#_bare_repo>>.
  
--Finally, we go through some of the details of what it actually does behind the scenes in <<ch10-git-internals#_plumbing_porcelain>>.
--
--==== git clone
-+Finally, we go through some of the details of what it actually does behind the scenes in <<ch10-git-internals#r_plumbing_porcelain>>.
+-Finally, we go through some of the details of what it actually does behind the scenes in <<ch10-git-internals#r_plumbing_porcelain>>.
++Finally, we go through some of the details of what it actually does behind the scenes in <<ch10-git-internals#_plumbing_porcelain>>.
++
++==== git clone
  
  The `git clone` command is actually something of a wrapper around several other commands.
  It creates a new directory, goes into it and runs `git init` to make it an empty Git repository, adds a remote (`git remote add`) to the URL that you pass it (by default named `origin`), runs a `git fetch` from that remote repository and then checks out the latest commit into your working directory with `git checkout`.
  
  The `git clone` command is used in dozens of places throughout the book, but we'll just list a few interesting places.
  
--It's basically introduced and explained in <<ch02-git-basics-chapter#_git_cloning>>, where we go through a few examples.
-+It's basically introduced and explained in <<ch02-git-basics#r_git_cloning>>, where we go through a few examples.
+-It's basically introduced and explained in <<ch02-git-basics#r_git_cloning>>, where we go through a few examples.
++It's basically introduced and explained in <<ch02-git-basics-chapter#_git_cloning>>, where we go through a few examples.
  
--In <<ch04-git-on-the-server#_getting_git_on_a_server>> we look at using the `--bare` option to create a copy of a Git repository with no working directory.
-+In <<ch04-git-server#r_git_on_the_server>> we look at using the `--bare` option to create a copy of a Git repository with no working directory.
+-In <<ch04-git-server#r_git_on_the_server>> we look at using the `--bare` option to create a copy of a Git repository with no working directory.
++In <<ch04-git-on-the-server#_getting_git_on_a_server>> we look at using the `--bare` option to create a copy of a Git repository with no working directory.
  
--In <<ch07-git-tools#_bundling>> we use it to unbundle a bundled Git repository.
-+In <<ch07-git-tools#r_bundling>> we use it to unbundle a bundled Git repository.
+-In <<ch07-git-tools#r_bundling>> we use it to unbundle a bundled Git repository.
++In <<ch07-git-tools#_bundling>> we use it to unbundle a bundled Git repository.
  
--Finally, in <<ch07-git-tools#_cloning_submodules>> we learn the `--recurse-submodules` option to make cloning a repository with submodules a little simpler.
-+Finally, in <<ch07-git-tools#r_cloning_submodules>> we learn the `--recursive` option to make cloning a repository with submodules a little simpler.
+-Finally, in <<ch07-git-tools#r_cloning_submodules>> we learn the `--recursive` option to make cloning a repository with submodules a little simpler.
++Finally, in <<ch07-git-tools#_cloning_submodules>> we learn the `--recurse-submodules` option to make cloning a repository with submodules a little simpler.
  
  Though it's used in many other places through the book, these are the ones that are somewhat unique or where it is used in ways that are a little different.
  
--
++
  === Basic Snapshotting
  
  For the basic workflow of staging content and committing it to your history, there are only a few basic commands.
  
--==== git add
--
++==== git add
++
  The `git add` command adds content from the working directory into the staging area (or ``index'') for the next commit.
  When the `git commit` command is run, by default it only looks at this staging area, so `git add` is used to craft what exactly you would like your next commit snapshot to look like.
  
  This command is an incredibly important command in Git and is mentioned or used dozens of times in this book.
  We'll quickly cover some of the unique uses that can be found.
  
--We first introduce and explain `git add` in detail in <<ch02-git-basics-chapter#_tracking_files>>.
-+We first introduce and explain `git add` in detail in <<ch02-git-basics#r_tracking_files>>.
+-We first introduce and explain `git add` in detail in <<ch02-git-basics#r_tracking_files>>.
++We first introduce and explain `git add` in detail in <<ch02-git-basics-chapter#_tracking_files>>.
  
--We mention how to use it to resolve merge conflicts in <<ch03-git-branching#_basic_merge_conflicts>>.
-+We mention how to use it to resolve merge conflicts in <<ch03-git-branching#r_basic_merge_conflicts>>.
+-We mention how to use it to resolve merge conflicts in <<ch03-git-branching#r_basic_merge_conflicts>>.
++We mention how to use it to resolve merge conflicts in <<ch03-git-branching#_basic_merge_conflicts>>.
  
--We go over using it to interactively stage only specific parts of a modified file in <<ch07-git-tools#_interactive_staging>>.
-+We go over using it to interactively stage only specific parts of a modified file in <<ch07-git-tools#r_interactive_staging>>.
+-We go over using it to interactively stage only specific parts of a modified file in <<ch07-git-tools#r_interactive_staging>>.
++We go over using it to interactively stage only specific parts of a modified file in <<ch07-git-tools#_interactive_staging>>.
  
--Finally, we emulate it at a low level in <<ch10-git-internals#_tree_objects>>, so you can get an idea of what it's doing behind the scenes.
--
--==== git status
-+Finally, we emulate it at a low level in <<ch10-git-internals#r_tree_objects>>, so you can get an idea of what it's doing behind the scenes.
+-Finally, we emulate it at a low level in <<ch10-git-internals#r_tree_objects>>, so you can get an idea of what it's doing behind the scenes.
++Finally, we emulate it at a low level in <<ch10-git-internals#_tree_objects>>, so you can get an idea of what it's doing behind the scenes.
++
++==== git status
  
  The `git status` command will show you the different states of files in your working directory and staging area.
  Which files are modified and unstaged and which are staged but not yet committed.
  In its normal form, it also will show you some basic hints on how to move files between these stages.
  
--We first cover `status` in <<ch02-git-basics-chapter#_checking_status>>, both in its basic and simplified forms.
-+We first cover `status` in <<ch02-git-basics#r_checking_status>>, both in its basic and simplified forms.
+-We first cover `status` in <<ch02-git-basics#r_checking_status>>, both in its basic and simplified forms.
++We first cover `status` in <<ch02-git-basics-chapter#_checking_status>>, both in its basic and simplified forms.
  While we use it throughout the book, pretty much everything you can do with the `git status` command is covered there.
  
--==== git diff
--
++==== git diff
++
  The `git diff` command is used when you want to see differences between any two trees.
  This could be the difference between your working environment and your staging area (`git diff` by itself), between your staging area and your last commit (`git diff --staged`), or between two commits (`git diff master branchB`).
  
--We first look at the basic uses of `git diff` in <<ch02-git-basics-chapter#_git_diff_staged>>, where we show how to see what changes are staged and which are not yet staged.
--
--We use it to look for possible whitespace issues before committing with the `--check` option in <<ch05-distributed-git#_commit_guidelines>>.
-+We first look at the basic uses of `git diff` in <<ch02-git-basics#r_git_diff_staged>>, where we show how to see what changes are staged and which are not yet staged.
+-We first look at the basic uses of `git diff` in <<ch02-git-basics#r_git_diff_staged>>, where we show how to see what changes are staged and which are not yet staged.
++We first look at the basic uses of `git diff` in <<ch02-git-basics-chapter#_git_diff_staged>>, where we show how to see what changes are staged and which are not yet staged.
++
++We use it to look for possible whitespace issues before committing with the `--check` option in <<ch05-distributed-git#_commit_guidelines>>.
  
--We see how to check the differences between branches more effectively with the `git diff A...B` syntax in <<ch05-distributed-git#_what_is_introduced>>.
-+We use it to look for possible whitespace issues before committing with the `--check` option in <<ch05-distributed-git#r_commit_guidelines>>.
+-We use it to look for possible whitespace issues before committing with the `--check` option in <<ch05-distributed-git#r_commit_guidelines>>.
++We see how to check the differences between branches more effectively with the `git diff A...B` syntax in <<ch05-distributed-git#_what_is_introduced>>.
  
--We use it to filter out whitespace differences with `-b` and how to compare different stages of conflicted files with `--theirs`, `--ours` and `--base` in <<ch07-git-tools#_advanced_merging>>.
-+We see how to check the differences between branches more effectively with the `git diff A...B` syntax in <<ch05-distributed-git#r_what_is_introduced>>.
+-We see how to check the differences between branches more effectively with the `git diff A...B` syntax in <<ch05-distributed-git#r_what_is_introduced>>.
++We use it to filter out whitespace differences with `-b` and how to compare different stages of conflicted files with `--theirs`, `--ours` and `--base` in <<ch07-git-tools#_advanced_merging>>.
  
--Finally, we use it to effectively compare submodule changes with `--submodule` in <<ch07-git-tools#_starting_submodules>>.
-+We use it to filter out whitespace differences with `-b` and how to compare different stages of conflicted files with `--theirs`, `--ours` and `--base` in <<ch07-git-tools#r_advanced_merging>>.
+-We use it to filter out whitespace differences with `-b` and how to compare different stages of conflicted files with `--theirs`, `--ours` and `--base` in <<ch07-git-tools#r_advanced_merging>>.
++Finally, we use it to effectively compare submodule changes with `--submodule` in <<ch07-git-tools#_starting_submodules>>.
  
--==== git difftool
-+Finally, we use it to effectively compare submodule changes with `--submodule` in <<ch07-git-tools#r_starting_submodules>>.
+-Finally, we use it to effectively compare submodule changes with `--submodule` in <<ch07-git-tools#r_starting_submodules>>.
++==== git difftool
  
  The `git difftool` command simply launches an external tool to show you the difference between two trees in case you want to use something other than the built in `git diff` command.
  
--We only briefly mention this in <<ch02-git-basics-chapter#_git_diff_staged>>.
--
--==== git commit
-+We only briefly mention this in <<ch02-git-basics#r_git_diff_staged>>.
+-We only briefly mention this in <<ch02-git-basics#r_git_diff_staged>>.
++We only briefly mention this in <<ch02-git-basics-chapter#_git_diff_staged>>.
++
++==== git commit
  
  The `git commit` command takes all the file contents that have been staged with `git add` and records a new permanent snapshot in the database and then moves the branch pointer on the current branch up to it.
  
--We first cover the basics of committing in <<ch02-git-basics-chapter#_committing_changes>>.
-+We first cover the basics of committing in <<ch02-git-basics#r_committing_changes>>.
+-We first cover the basics of committing in <<ch02-git-basics#r_committing_changes>>.
++We first cover the basics of committing in <<ch02-git-basics-chapter#_committing_changes>>.
  There we also demonstrate how to use the `-a` flag to skip the `git add` step in daily workflows and how to use the `-m` flag to pass a commit message in on the command line instead of firing up an editor.
  
--In <<ch02-git-basics-chapter#_undoing>> we cover using the `--amend` option to redo the most recent commit.
--
--In <<ch03-git-branching#_git_branches_overview>>, we go into much more detail about what `git commit` does and why it does it like that.
-+In <<ch02-git-basics#r_undoing>> we cover using the `--amend` option to redo the most recent commit.
+-In <<ch02-git-basics#r_undoing>> we cover using the `--amend` option to redo the most recent commit.
++In <<ch02-git-basics-chapter#_undoing>> we cover using the `--amend` option to redo the most recent commit.
++
++In <<ch03-git-branching#_git_branches_overview>>, we go into much more detail about what `git commit` does and why it does it like that.
  
--We looked at how to sign commits cryptographically with the `-S` flag in <<ch07-git-tools#_signing_commits>>.
-+In <<ch03-git-branching#r_git_branches_overview>>, we go into much more detail about what `git commit` does and why it does it like that.
+-In <<ch03-git-branching#r_git_branches_overview>>, we go into much more detail about what `git commit` does and why it does it like that.
++We looked at how to sign commits cryptographically with the `-S` flag in <<ch07-git-tools#_signing_commits>>.
  
--Finally, we take a look at what the `git commit` command does in the background and how it's actually implemented in <<ch10-git-internals#_git_commit_objects>>.
-+We looked at how to sign commits cryptographically with the `-S` flag in <<ch07-git-tools#r_signing_commits>>.
+-We looked at how to sign commits cryptographically with the `-S` flag in <<ch07-git-tools#r_signing_commits>>.
++Finally, we take a look at what the `git commit` command does in the background and how it's actually implemented in <<ch10-git-internals#_git_commit_objects>>.
  
--==== git reset
-+Finally, we take a look at what the `git commit` command does in the background and how it's actually implemented in <<ch10-git-internals#r_git_commit_objects>>.
+-Finally, we take a look at what the `git commit` command does in the background and how it's actually implemented in <<ch10-git-internals#r_git_commit_objects>>.
++==== git reset
  
  The `git reset` command is primarily used to undo things, as you can possibly tell by the verb.
  It moves around the `HEAD` pointer and optionally changes the `index` or staging area and can also optionally change the working directory if you use `--hard`.
  This final option makes it possible for this command to lose your work if used incorrectly, so make sure you understand it before using it.
  
--We first effectively cover the simplest use of `git reset` in <<ch02-git-basics-chapter#_unstaging>>, where we use it to unstage a file we had run `git add` on.
--
--We then cover it in quite some detail in <<ch07-git-tools#_git_reset>>, which is entirely devoted to explaining this command.
-+We first effectively cover the simplest use of `git reset` in <<ch02-git-basics#r_unstaging>>, where we use it to unstage a file we had run `git add` on.
+-We first effectively cover the simplest use of `git reset` in <<ch02-git-basics#r_unstaging>>, where we use it to unstage a file we had run `git add` on.
++We first effectively cover the simplest use of `git reset` in <<ch02-git-basics-chapter#_unstaging>>, where we use it to unstage a file we had run `git add` on.
++
++We then cover it in quite some detail in <<ch07-git-tools#_git_reset>>, which is entirely devoted to explaining this command.
  
--We use `git reset --hard` to abort a merge in <<ch07-git-tools#_abort_merge>>, where we also use `git merge --abort`, which is a bit of a wrapper for the `git reset` command.
-+We then cover it in quite some detail in <<ch07-git-tools#r_git_reset>>, which is entirely devoted to explaining this command.
+-We then cover it in quite some detail in <<ch07-git-tools#r_git_reset>>, which is entirely devoted to explaining this command.
++We use `git reset --hard` to abort a merge in <<ch07-git-tools#_abort_merge>>, where we also use `git merge --abort`, which is a bit of a wrapper for the `git reset` command.
  
--==== git rm
-+We use `git reset --hard` to abort a merge in <<ch07-git-tools#r_abort_merge>>, where we also use `git merge --abort`, which is a bit of a wrapper for the `git reset` command.
+-We use `git reset --hard` to abort a merge in <<ch07-git-tools#r_abort_merge>>, where we also use `git merge --abort`, which is a bit of a wrapper for the `git reset` command.
++==== git rm
  
  The `git rm` command is used to remove files from the staging area and working directory for Git.
  It is similar to `git add` in that it stages a removal of a file for the next commit.
  
--We cover the `git rm` command in some detail in <<ch02-git-basics-chapter#_removing_files>>, including recursively removing files and only removing files from the staging area but leaving them in the working directory with `--cached`.
-+We cover the `git rm` command in some detail in <<ch02-git-basics#r_removing_files>>, including recursively removing files and only removing files from the staging area but leaving them in the working directory with `--cached`.
+-We cover the `git rm` command in some detail in <<ch02-git-basics#r_removing_files>>, including recursively removing files and only removing files from the staging area but leaving them in the working directory with `--cached`.
++We cover the `git rm` command in some detail in <<ch02-git-basics-chapter#_removing_files>>, including recursively removing files and only removing files from the staging area but leaving them in the working directory with `--cached`.
  
--The only other differing use of `git rm` in the book is in <<ch10-git-internals#_removing_objects>> where we briefly use and explain the `--ignore-unmatch` when running `git filter-branch`, which simply makes it not error out when the file we are trying to remove doesn't exist.
-+The only other differing use of `git rm` in the book is in <<ch10-git-internals#r_removing_objects>> where we briefly use and explain the `--ignore-unmatch` when running `git filter-branch`, which simply makes it not error out when the file we are trying to remove doesn't exist.
+-The only other differing use of `git rm` in the book is in <<ch10-git-internals#r_removing_objects>> where we briefly use and explain the `--ignore-unmatch` when running `git filter-branch`, which simply makes it not error out when the file we are trying to remove doesn't exist.
++The only other differing use of `git rm` in the book is in <<ch10-git-internals#_removing_objects>> where we briefly use and explain the `--ignore-unmatch` when running `git filter-branch`, which simply makes it not error out when the file we are trying to remove doesn't exist.
  This can be useful for scripting purposes.
  
--==== git mv
--
++==== git mv
++
  The `git mv` command is a thin convenience command to move a file and then run `git add` on the new file and `git rm` on the old file.
  
--We only briefly mention this command in <<ch02-git-basics-chapter#_git_mv>>.
--
--==== git clean
-+We only briefly mention this command in <<ch02-git-basics#r_git_mv>>.
+-We only briefly mention this command in <<ch02-git-basics#r_git_mv>>.
++We only briefly mention this command in <<ch02-git-basics-chapter#_git_mv>>.
++
++==== git clean
  
  The `git clean` command is used to remove unwanted files from your working directory.
  This could include removing temporary build artifacts or merge conflict files.
  
--We cover many of the options and scenarios in which you might used the clean command in <<ch07-git-tools#_git_clean>>.
-+We cover many of the options and scenarios in which you might used the clean command in <<ch07-git-tools#r_git_clean>>.
+-We cover many of the options and scenarios in which you might used the clean command in <<ch07-git-tools#r_git_clean>>.
++We cover many of the options and scenarios in which you might used the clean command in <<ch07-git-tools#_git_clean>>.
  
  === Branching and Merging
  
  There are just a handful of commands that implement most of the branching and merging functionality in Git.
  
--==== git branch
--
++==== git branch
++
  The `git branch` command is actually something of a branch management tool.
  It can list the branches you have, create a new branch, delete branches and rename branches.
  
  Most of <<ch03-git-branching#ch03-git-branching>> is dedicated to the `branch` command and it's used throughout the entire chapter.
--We first introduce it in <<ch03-git-branching#_create_new_branch>> and we go through most of its other features (listing and deleting) in <<ch03-git-branching#_branch_management>>.
--
--In <<ch03-git-branching#_tracking_branches>> we use the `git branch -u` option to set up a tracking branch.
-+We first introduce it in <<ch03-git-branching#r_create_new_branch>> and we go through most of its other features (listing and deleting) in <<ch03-git-branching#r_branch_management>>.
+-We first introduce it in <<ch03-git-branching#r_create_new_branch>> and we go through most of its other features (listing and deleting) in <<ch03-git-branching#r_branch_management>>.
++We first introduce it in <<ch03-git-branching#_create_new_branch>> and we go through most of its other features (listing and deleting) in <<ch03-git-branching#_branch_management>>.
++
++In <<ch03-git-branching#_tracking_branches>> we use the `git branch -u` option to set up a tracking branch.
  
--Finally, we go through some of what it does in the background in <<ch10-git-internals#_git_refs>>.
-+In <<ch03-git-branching#r_tracking_branches>> we use the `git branch -u` option to set up a tracking branch.
+-In <<ch03-git-branching#r_tracking_branches>> we use the `git branch -u` option to set up a tracking branch.
++Finally, we go through some of what it does in the background in <<ch10-git-internals#_git_refs>>.
  
--==== git checkout
-+Finally, we go through some of what it does in the background in <<ch10-git-internals#r_git_refs>>.
+-Finally, we go through some of what it does in the background in <<ch10-git-internals#r_git_refs>>.
++==== git checkout
  
  The `git checkout` command is used to switch branches and check content out into your working directory.
  
--We first encounter the command in <<ch03-git-branching#_switching_branches>> along with the `git branch` command.
-+We first encounter the command in <<ch03-git-branching#r_switching_branches>> along with the `git branch` command.
+-We first encounter the command in <<ch03-git-branching#r_switching_branches>> along with the `git branch` command.
++We first encounter the command in <<ch03-git-branching#_switching_branches>> along with the `git branch` command.
  
--We see how to use it to start tracking branches with the `--track` flag in <<ch03-git-branching#_tracking_branches>>.
-+We see how to use it to start tracking branches with the `--track` flag in <<ch03-git-branching#r_tracking_branches>>.
+-We see how to use it to start tracking branches with the `--track` flag in <<ch03-git-branching#r_tracking_branches>>.
++We see how to use it to start tracking branches with the `--track` flag in <<ch03-git-branching#_tracking_branches>>.
  
--We use it to reintroduce file conflicts with `--conflict=diff3` in <<ch07-git-tools#_checking_out_conflicts>>.
-+We use it to reintroduce file conflicts with `--conflict=diff3` in <<ch07-git-tools#r_checking_out_conflicts>>.
+-We use it to reintroduce file conflicts with `--conflict=diff3` in <<ch07-git-tools#r_checking_out_conflicts>>.
++We use it to reintroduce file conflicts with `--conflict=diff3` in <<ch07-git-tools#_checking_out_conflicts>>.
  
--We go into closer detail on its relationship with `git reset` in <<ch07-git-tools#_git_reset>>.
-+We go into closer detail on its relationship with `git reset` in <<ch07-git-tools#r_git_reset>>.
+-We go into closer detail on its relationship with `git reset` in <<ch07-git-tools#r_git_reset>>.
++We go into closer detail on its relationship with `git reset` in <<ch07-git-tools#_git_reset>>.
  
--Finally, we go into some implementation detail in <<ch10-git-internals#ref_the_ref>>.
--
--==== git merge
-+Finally, we go into some implementation detail in <<ch10-git-internals#r_the_head>>.
+-Finally, we go into some implementation detail in <<ch10-git-internals#r_the_head>>.
++Finally, we go into some implementation detail in <<ch10-git-internals#ref_the_ref>>.
++
++==== git merge
  
  The `git merge` tool is used to merge one or more branches into the branch you have checked out.
  It will then advance the current branch to the result of the merge.
  
--The `git merge` command was first introduced in <<ch03-git-branching#_basic_branching>>.
-+The `git merge` command was first introduced in <<ch03-git-branching#r_basic_branching>>.
+-The `git merge` command was first introduced in <<ch03-git-branching#r_basic_branching>>.
++The `git merge` command was first introduced in <<ch03-git-branching#_basic_branching>>.
  Though it is used in various places in the book, there are very few variations of the `merge` command -- generally just `git merge <branch>` with the name of the single branch you want to merge in.
  
--We covered how to do a squashed merge (where Git merges the work but pretends like it's just a new commit without recording the history of the branch you're merging in) at the very end of <<ch05-distributed-git#_public_project>>.
--
--We went over a lot about the merge process and command, including the `-Xignore-space-change` command and the `--abort` flag to abort a problem merge in <<ch07-git-tools#_advanced_merging>>.
-+We covered how to do a squashed merge (where Git merges the work but pretends like it's just a new commit without recording the history of the branch you're merging in) at the very end of <<ch05-distributed-git#r_public_project>>.
+-We covered how to do a squashed merge (where Git merges the work but pretends like it's just a new commit without recording the history of the branch you're merging in) at the very end of <<ch05-distributed-git#r_public_project>>.
++We covered how to do a squashed merge (where Git merges the work but pretends like it's just a new commit without recording the history of the branch you're merging in) at the very end of <<ch05-distributed-git#_public_project>>.
++
++We went over a lot about the merge process and command, including the `-Xignore-space-change` command and the `--abort` flag to abort a problem merge in <<ch07-git-tools#_advanced_merging>>.
  
--We learned how to verify signatures before merging if your project is using GPG signing in <<ch07-git-tools#_signing_commits>>.
-+We went over a lot about the merge process and command, including the `-Xignore-space-change` command and the `--abort` flag to abort a problem merge in <<ch07-git-tools#r_advanced_merging>>.
+-We went over a lot about the merge process and command, including the `-Xignore-space-change` command and the `--abort` flag to abort a problem merge in <<ch07-git-tools#r_advanced_merging>>.
++We learned how to verify signatures before merging if your project is using GPG signing in <<ch07-git-tools#_signing_commits>>.
  
--Finally, we learned about Subtree merging in <<ch07-git-tools#_subtree_merge>>.
-+We learned how to verify signatures before merging if your project is using GPG signing in <<ch07-git-tools#r_signing_commits>>.
+-We learned how to verify signatures before merging if your project is using GPG signing in <<ch07-git-tools#r_signing_commits>>.
++Finally, we learned about Subtree merging in <<ch07-git-tools#_subtree_merge>>.
  
--==== git mergetool
-+Finally, we learned about Subtree merging in <<ch07-git-tools#r_subtree_merge>>.
+-Finally, we learned about Subtree merging in <<ch07-git-tools#r_subtree_merge>>.
++==== git mergetool
  
  The `git mergetool` command simply launches an external merge helper in case you have issues with a merge in Git.
  
--We mention it quickly in <<ch03-git-branching#_basic_merge_conflicts>> and go into detail on how to implement your own external merge tool in <<ch08-customizing-git#_external_merge_tools>>.
--
--==== git log
-+We mention it quickly in <<ch03-git-branching#r_basic_merge_conflicts>> and go into detail on how to implement your own external merge tool in <<ch08-customizing-git#r_external_merge_tools>>.
+-We mention it quickly in <<ch03-git-branching#r_basic_merge_conflicts>> and go into detail on how to implement your own external merge tool in <<ch08-customizing-git#r_external_merge_tools>>.
++We mention it quickly in <<ch03-git-branching#_basic_merge_conflicts>> and go into detail on how to implement your own external merge tool in <<ch08-customizing-git#_external_merge_tools>>.
++
++==== git log
  
  The `git log` command is used to show the reachable recorded history of a project from the most recent commit snapshot backwards.
  By default it will only show the history of the branch you're currently on, but can be given different or even multiple heads or branches from which to traverse.
-@@ -281,305 +198,244 @@
+@@ -198,244 +281,305 @@
  
  This command is used in nearly every chapter of the book to demonstrate the history of a project.
  
--We introduce the command and cover it in some depth in <<ch02-git-basics-chapter#_viewing_history>>.
-+We introduce the command and cover it in some depth in <<ch02-git-basics#r_viewing_history>>.
+-We introduce the command and cover it in some depth in <<ch02-git-basics#r_viewing_history>>.
++We introduce the command and cover it in some depth in <<ch02-git-basics-chapter#_viewing_history>>.
  There we look at the `-p` and `--stat` option to get an idea of what was introduced in each commit and the `--pretty` and `--oneline` options to view the history more concisely, along with some simple date and author filtering options.
  
--In <<ch03-git-branching#_create_new_branch>> we use it with the `--decorate` option to easily visualize where our branch pointers are located and we also use the `--graph` option to see what divergent histories look like.
-+In <<ch03-git-branching#r_create_new_branch>> we use it with the `--decorate` option to easily visualize where our branch pointers are located and we also use the `--graph` option to see what divergent histories look like.
+-In <<ch03-git-branching#r_create_new_branch>> we use it with the `--decorate` option to easily visualize where our branch pointers are located and we also use the `--graph` option to see what divergent histories look like.
++In <<ch03-git-branching#_create_new_branch>> we use it with the `--decorate` option to easily visualize where our branch pointers are located and we also use the `--graph` option to see what divergent histories look like.
  
--In <<ch05-distributed-git#_private_team>> and <<ch07-git-tools#_commit_ranges>> we cover the `branchA..branchB` syntax to use the `git log` command to see what commits are unique to a branch relative to another branch.
--In <<ch07-git-tools#_commit_ranges>> we go through this fairly extensively.
-+In <<ch05-distributed-git#r_private_team>> and <<ch07-git-tools#r_commit_ranges>> we cover the `branchA..branchB` syntax to use the `git log` command to see what commits are unique to a branch relative to another branch.
-+In <<ch07-git-tools#r_commit_ranges>> we go through this fairly extensively.
+-In <<ch05-distributed-git#r_private_team>> and <<ch07-git-tools#r_commit_ranges>> we cover the `branchA..branchB` syntax to use the `git log` command to see what commits are unique to a branch relative to another branch.
+-In <<ch07-git-tools#r_commit_ranges>> we go through this fairly extensively.
++In <<ch05-distributed-git#_private_team>> and <<ch07-git-tools#_commit_ranges>> we cover the `branchA..branchB` syntax to use the `git log` command to see what commits are unique to a branch relative to another branch.
++In <<ch07-git-tools#_commit_ranges>> we go through this fairly extensively.
  
--In <<ch07-git-tools#_merge_log>> and <<ch07-git-tools#_triple_dot>> we cover using the `branchA...branchB` format and the `--left-right` syntax to see what is in one branch or the other but not in both.
--In <<ch07-git-tools#_merge_log>> we also look at how to use the `--merge` option to help with merge conflict debugging as well as using the `--cc` option to look at merge commit conflicts in your history.
-+In <<ch07-git-tools#r_merge_log>> and <<ch07-git-tools#r_triple_dot>> we cover using the `branchA...branchB` format and the `--left-right` syntax to see what is in one branch or the other but not in both.
-+In <<ch07-git-tools#r_merge_log>> we also look at how to use the `--merge` option to help with merge conflict debugging as well as using the `--cc` option to look at merge commit conflicts in your history.
+-In <<ch07-git-tools#r_merge_log>> and <<ch07-git-tools#r_triple_dot>> we cover using the `branchA...branchB` format and the `--left-right` syntax to see what is in one branch or the other but not in both.
+-In <<ch07-git-tools#r_merge_log>> we also look at how to use the `--merge` option to help with merge conflict debugging as well as using the `--cc` option to look at merge commit conflicts in your history.
++In <<ch07-git-tools#_merge_log>> and <<ch07-git-tools#_triple_dot>> we cover using the `branchA...branchB` format and the `--left-right` syntax to see what is in one branch or the other but not in both.
++In <<ch07-git-tools#_merge_log>> we also look at how to use the `--merge` option to help with merge conflict debugging as well as using the `--cc` option to look at merge commit conflicts in your history.
  
--In <<ch07-git-tools#_git_reflog>> we use the `-g` option to view the Git reflog through this tool instead of doing branch traversal.
-+In <<ch07-git-tools#r_git_reflog>> we use the `-g` option to view the Git reflog through this tool instead of doing branch traversal.
+-In <<ch07-git-tools#r_git_reflog>> we use the `-g` option to view the Git reflog through this tool instead of doing branch traversal.
++In <<ch07-git-tools#_git_reflog>> we use the `-g` option to view the Git reflog through this tool instead of doing branch traversal.
  
--In <<ch07-git-tools#_searching>> we look at using the `-S` and `-L` options to do fairly sophisticated searches for something that happened historically in the code such as seeing the history of a function.
-+In <<ch07-git-tools#r_searching>> we look at using the `-S` and `-L` options to do fairly sophisticated searches for something that happened historically in the code such as seeing the history of a function.
+-In <<ch07-git-tools#r_searching>> we look at using the `-S` and `-L` options to do fairly sophisticated searches for something that happened historically in the code such as seeing the history of a function.
++In <<ch07-git-tools#_searching>> we look at using the `-S` and `-L` options to do fairly sophisticated searches for something that happened historically in the code such as seeing the history of a function.
  
--In <<ch07-git-tools#_signing_commits>> we see how to use `--show-signature` to add a validation string to each commit in the `git log` output based on if it was validly signed or not.
--
--==== git stash
-+In <<ch07-git-tools#r_signing_commits>> we see how to use `--show-signature` to add a validation string to each commit in the `git log` output based on if it was validly signed or not.
+-In <<ch07-git-tools#r_signing_commits>> we see how to use `--show-signature` to add a validation string to each commit in the `git log` output based on if it was validly signed or not.
++In <<ch07-git-tools#_signing_commits>> we see how to use `--show-signature` to add a validation string to each commit in the `git log` output based on if it was validly signed or not.
++
++==== git stash
  
  The `git stash` command is used to temporarily store uncommitted work in order to clean out your working directory without having to commit unfinished work on a branch.
  
--This is basically entirely covered in <<ch07-git-tools#_git_stashing>>.
--
--==== git tag
-+This is basically entirely covered in <<ch07-git-tools#r_git_stashing>>.
+-This is basically entirely covered in <<ch07-git-tools#r_git_stashing>>.
++This is basically entirely covered in <<ch07-git-tools#_git_stashing>>.
++
++==== git tag
  
  The `git tag` command is used to give a permanent bookmark to a specific point in the code history.
  Generally this is used for things like releases.
  
--This command is introduced and covered in detail in <<ch02-git-basics-chapter#_git_tagging>> and we use it in practice in <<ch05-distributed-git#_tagging_releases>>.
--
--We also cover how to create a GPG signed tag with the `-s` flag and verify one with the `-v` flag in <<ch07-git-tools#_signing>>.
-+This command is introduced and covered in detail in <<ch02-git-basics#r_git_tagging>> and we use it in practice in <<ch05-distributed-git#r_tagging_releases>>.
+-This command is introduced and covered in detail in <<ch02-git-basics#r_git_tagging>> and we use it in practice in <<ch05-distributed-git#r_tagging_releases>>.
++This command is introduced and covered in detail in <<ch02-git-basics-chapter#_git_tagging>> and we use it in practice in <<ch05-distributed-git#_tagging_releases>>.
++
++We also cover how to create a GPG signed tag with the `-s` flag and verify one with the `-v` flag in <<ch07-git-tools#_signing>>.
  
-+We also cover how to create a GPG signed tag with the `-s` flag and verify one with the `-v` flag in <<ch07-git-tools#r_signing>>.
+-We also cover how to create a GPG signed tag with the `-s` flag and verify one with the `-v` flag in <<ch07-git-tools#r_signing>>.
  
  === Sharing and Updating Projects
  
  There are not very many commands in Git that access the network, nearly all of the commands operate on the local database.
  When you are ready to share your work or pull changes from elsewhere, there are a handful of commands that deal with remote repositories.
  
--==== git fetch
--
++==== git fetch
++
  The `git fetch` command communicates with a remote repository and fetches down all the information that is in that repository that is not in your current one and stores it in your local database.
  
--We first look at this command in <<ch02-git-basics-chapter#_fetching_and_pulling>> and we continue to see examples of its use in <<ch03-git-branching#_remote_branches>>.
--
--We also use it in several of the examples in <<ch05-distributed-git#_contributing_project>>.
-+We first look at this command in <<ch02-git-basics#r_fetching_and_pulling>> and we continue to see examples of it use in <<ch03-git-branching#r_remote_branches>>.
+-We first look at this command in <<ch02-git-basics#r_fetching_and_pulling>> and we continue to see examples of it use in <<ch03-git-branching#r_remote_branches>>.
++We first look at this command in <<ch02-git-basics-chapter#_fetching_and_pulling>> and we continue to see examples of its use in <<ch03-git-branching#_remote_branches>>.
++
++We also use it in several of the examples in <<ch05-distributed-git#_contributing_project>>.
  
--We use it to fetch a single specific reference that is outside of the default space in <<ch06-github#_pr_refs>> and we see how to fetch from a bundle in <<ch07-git-tools#_bundling>>.
-+We also use it in several of the examples in <<ch05-distributed-git#r_contributing_project>>.
+-We also use it in several of the examples in <<ch05-distributed-git#r_contributing_project>>.
++We use it to fetch a single specific reference that is outside of the default space in <<ch06-github#_pr_refs>> and we see how to fetch from a bundle in <<ch07-git-tools#_bundling>>.
  
--We set up highly custom refspecs in order to make `git fetch` do something a little different than the default in <<ch10-git-internals#_refspec>>.
-+We use it to fetch a single specific reference that is outside of the default space in <<ch06-github#r_pr_refs>> and we see how to fetch from a bundle in <<ch07-git-tools#r_bundling>>.
+-We use it to fetch a single specific reference that is outside of the default space in <<ch06-github#r_pr_refs>> and we see how to fetch from a bundle in <<ch07-git-tools#r_bundling>>.
++We set up highly custom refspecs in order to make `git fetch` do something a little different than the default in <<ch10-git-internals#_refspec>>.
  
--==== git pull
-+We set up highly custom refspecs in order to make `git fetch` do something a little different than the default in <<ch10-git-internals#r_refspec>>.
+-We set up highly custom refspecs in order to make `git fetch` do something a little different than the default in <<ch10-git-internals#r_refspec>>.
++==== git pull
  
  The `git pull` command is basically a combination of the `git fetch` and `git merge` commands, where Git will fetch from the remote you specify and then immediately try to merge it into the branch you're on.
  
--We introduce it quickly in <<ch02-git-basics-chapter#_fetching_and_pulling>> and show how to see what it will merge if you run it in <<ch02-git-basics-chapter#_inspecting_remote>>.
--
--We also see how to use it to help with rebasing difficulties in <<ch03-git-branching#_rebase_rebase>>.
-+We introduce it quickly in <<ch02-git-basics#r_fetching_and_pulling>> and show how to see what it will merge if you run it in <<ch02-git-basics#r_inspecting_remote>>.
+-We introduce it quickly in <<ch02-git-basics#r_fetching_and_pulling>> and show how to see what it will merge if you run it in <<ch02-git-basics#r_inspecting_remote>>.
++We introduce it quickly in <<ch02-git-basics-chapter#_fetching_and_pulling>> and show how to see what it will merge if you run it in <<ch02-git-basics-chapter#_inspecting_remote>>.
++
++We also see how to use it to help with rebasing difficulties in <<ch03-git-branching#_rebase_rebase>>.
  
--We show how to use it with a URL to pull in changes in a one-off fashion in <<ch05-distributed-git#_checking_out_remotes>>.
-+We also see how to use it to help with rebasing difficulties in <<ch03-git-branching#r_rebase_rebase>>.
+-We also see how to use it to help with rebasing difficulties in <<ch03-git-branching#r_rebase_rebase>>.
++We show how to use it with a URL to pull in changes in a one-off fashion in <<ch05-distributed-git#_checking_out_remotes>>.
  
--Finally, we very quickly mention that you can use the `--verify-signatures` option to it in order to verify that commits you are pulling have been GPG signed in <<ch07-git-tools#_signing_commits>>.
-+We show how to use it with a URL to pull in changes in a one-off fashion in <<ch05-distributed-git#r_checking_out_remotes>>.
+-We show how to use it with a URL to pull in changes in a one-off fashion in <<ch05-distributed-git#r_checking_out_remotes>>.
++Finally, we very quickly mention that you can use the `--verify-signatures` option to it in order to verify that commits you are pulling have been GPG signed in <<ch07-git-tools#_signing_commits>>.
  
--==== git push
-+Finally, we very quickly mention that you can use the `--verify-signatures` option to it in order to verify that commits you are pulling have been GPG signed in <<ch07-git-tools#r_signing_commits>>.
+-Finally, we very quickly mention that you can use the `--verify-signatures` option to it in order to verify that commits you are pulling have been GPG signed in <<ch07-git-tools#r_signing_commits>>.
++==== git push
  
  The `git push` command is used to communicate with another repository, calculate what your local database has that the remote one does not, and then pushes the difference into the other repository.
  It requires write access to the other repository and so normally is authenticated somehow.
  
--We first look at the `git push` command in <<ch02-git-basics-chapter#_pushing_remotes>>.
-+We first look at the `git push` command in <<ch02-git-basics#r_pushing_remotes>>.
+-We first look at the `git push` command in <<ch02-git-basics#r_pushing_remotes>>.
++We first look at the `git push` command in <<ch02-git-basics-chapter#_pushing_remotes>>.
  Here we cover the basics of pushing a branch to a remote repository.
--In <<ch03-git-branching#_pushing_branches>> we go a little deeper into pushing specific branches and in <<ch03-git-branching#_tracking_branches>> we see how to set up tracking branches to automatically push to.
--In <<ch03-git-branching#_delete_branches>> we use the `--delete` flag to delete a branch on the server with `git push`.
-+In <<ch03-git-branching#r_pushing_branches>> we go a little deeper into pushing specific branches and in <<ch03-git-branching#r_tracking_branches>> we see how to set up tracking branches to automatically push to.
-+In <<ch03-git-branching#r_delete_branches>> we use the `--delete` flag to delete a branch on the server with `git push`.
+-In <<ch03-git-branching#r_pushing_branches>> we go a little deeper into pushing specific branches and in <<ch03-git-branching#r_tracking_branches>> we see how to set up tracking branches to automatically push to.
+-In <<ch03-git-branching#r_delete_branches>> we use the `--delete` flag to delete a branch on the server with `git push`.
++In <<ch03-git-branching#_pushing_branches>> we go a little deeper into pushing specific branches and in <<ch03-git-branching#_tracking_branches>> we see how to set up tracking branches to automatically push to.
++In <<ch03-git-branching#_delete_branches>> we use the `--delete` flag to delete a branch on the server with `git push`.
  
--Throughout <<ch05-distributed-git#_contributing_project>> we see several examples of using `git push` to share work on branches through multiple remotes.
-+Throughout <<ch05-distributed-git#r_contributing_project>> we see several examples of using `git push` to share work on branches through multiple remotes.
+-Throughout <<ch05-distributed-git#r_contributing_project>> we see several examples of using `git push` to share work on branches through multiple remotes.
++Throughout <<ch05-distributed-git#_contributing_project>> we see several examples of using `git push` to share work on branches through multiple remotes.
  
--We see how to use it to share tags that you have made with the `--tags` option in <<ch02-git-basics-chapter#_sharing_tags>>.
-+We see how to use it to share tags that you have made with the `--tags` option in <<ch02-git-basics#r_sharing_tags>>.
+-We see how to use it to share tags that you have made with the `--tags` option in <<ch02-git-basics#r_sharing_tags>>.
++We see how to use it to share tags that you have made with the `--tags` option in <<ch02-git-basics-chapter#_sharing_tags>>.
  
--In <<ch07-git-tools#_publishing_submodules>> we use the `--recurse-submodules` option to check that all of our submodules work has been published before pushing the superproject, which can be really helpful when using submodules.
-+In <<ch07-git-tools#r_publishing_submodules>> we use the `--recurse-submodules` option to check that all of our submodules work has been published before pushing the superproject, which can be really helpful when using submodules.
+-In <<ch07-git-tools#r_publishing_submodules>> we use the `--recurse-submodules` option to check that all of our submodules work has been published before pushing the superproject, which can be really helpful when using submodules.
++In <<ch07-git-tools#_publishing_submodules>> we use the `--recurse-submodules` option to check that all of our submodules work has been published before pushing the superproject, which can be really helpful when using submodules.
  
--In <<ch08-customizing-git#_other_client_hooks>> we talk briefly about the `pre-push` hook, which is a script we can setup to run before a push completes to verify that it should be allowed to push.
-+In <<ch08-customizing-git#r_other_client_hooks>> we talk briefly about the `pre-push` hook, which is a script we can setup to run before a push completes to verify that it should be allowed to push.
+-In <<ch08-customizing-git#r_other_client_hooks>> we talk briefly about the `pre-push` hook, which is a script we can setup to run before a push completes to verify that it should be allowed to push.
++In <<ch08-customizing-git#_other_client_hooks>> we talk briefly about the `pre-push` hook, which is a script we can setup to run before a push completes to verify that it should be allowed to push.
  
--Finally, in <<ch10-git-internals#_pushing_refspecs>> we look at pushing with a full refspec instead of the general shortcuts that are normally used.
-+Finally, in <<ch10-git-internals#r_pushing_refspecs>> we look at pushing with a full refspec instead of the general shortcuts that are normally used.
+-Finally, in <<ch10-git-internals#r_pushing_refspecs>> we look at pushing with a full refspec instead of the general shortcuts that are normally used.
++Finally, in <<ch10-git-internals#_pushing_refspecs>> we look at pushing with a full refspec instead of the general shortcuts that are normally used.
  This can help you be very specific about what work you wish to share.
  
--==== git remote
--
++==== git remote
++
  The `git remote` command is a management tool for your record of remote repositories.
  It allows you to save long URLs as short handles, such as ``origin'' so you don't have to type them out all the time.
  You can have several of these and the `git remote` command is used to add, change and delete them.
  
--This command is covered in detail in <<ch02-git-basics-chapter#_remote_repos>>, including listing, adding, removing and renaming them.
-+This command is covered in detail in <<ch02-git-basics#r_remote_repos>>, including listing, adding, removing and renaming them.
+-This command is covered in detail in <<ch02-git-basics#r_remote_repos>>, including listing, adding, removing and renaming them.
++This command is covered in detail in <<ch02-git-basics-chapter#_remote_repos>>, including listing, adding, removing and renaming them.
  
  It is used in nearly every subsequent chapter in the book too, but always in the standard `git remote add <name> <url>` format.
  
--==== git archive
--
++==== git archive
++
  The `git archive` command is used to create an archive file of a specific snapshot of the project.
  
--We use `git archive` to create a tarball of a project for sharing in <<ch05-distributed-git#_preparing_release>>.
--
--==== git submodule
-+We use `git archive` to create a tarball of a project for sharing in <<ch05-distributed-git#r_preparing_release>>.
+-We use `git archive` to create a tarball of a project for sharing in <<ch05-distributed-git#r_preparing_release>>.
++We use `git archive` to create a tarball of a project for sharing in <<ch05-distributed-git#_preparing_release>>.
++
++==== git submodule
  
  The `git submodule` command is used to manage external repositories within a normal repositories.
  This could be for libraries or other types of shared resources.
  The `submodule` command has several sub-commands (`add`, `update`, `sync`, etc) for managing these resources.
  
--This command is only mentioned and entirely covered in <<ch07-git-tools#_git_submodules>>.
-+This command is only mentioned and entirely covered in <<ch07-git-tools#r_git_submodules>>.
+-This command is only mentioned and entirely covered in <<ch07-git-tools#r_git_submodules>>.
++This command is only mentioned and entirely covered in <<ch07-git-tools#_git_submodules>>.
  
  === Inspection and Comparison
  
--==== git show
--
++==== git show
++
  The `git show` command can show a Git object in a simple and human readable way.
  Normally you would use this to show the information about a tag or a commit.
  
--We first use it to show annotated tag information in <<ch02-git-basics-chapter#_annotated_tags>>.
-+We first use it to show annotated tag information in <<ch02-git-basics#r_annotated_tags>>.
+-We first use it to show annotated tag information in <<ch02-git-basics#r_annotated_tags>>.
++We first use it to show annotated tag information in <<ch02-git-basics-chapter#_annotated_tags>>.
  
--Later we use it quite a bit in <<ch07-git-tools#_revision_selection>> to show the commits that our various revision selections resolve to.
-+Later we use it quite a bit in <<ch07-git-tools#r_revision_selection>> to show the commits that our various revision selections resolve to.
+-Later we use it quite a bit in <<ch07-git-tools#r_revision_selection>> to show the commits that our various revision selections resolve to.
++Later we use it quite a bit in <<ch07-git-tools#_revision_selection>> to show the commits that our various revision selections resolve to.
  
--One of the more interesting things we do with `git show` is in <<ch07-git-tools#_manual_remerge>> to extract specific file contents of various stages during a merge conflict.
--
--==== git shortlog
-+One of the more interesting things we do with `git show` is in <<ch07-git-tools#r_manual_remerge>> to extract specific file contents of various stages during a merge conflict.
+-One of the more interesting things we do with `git show` is in <<ch07-git-tools#r_manual_remerge>> to extract specific file contents of various stages during a merge conflict.
++One of the more interesting things we do with `git show` is in <<ch07-git-tools#_manual_remerge>> to extract specific file contents of various stages during a merge conflict.
++
++==== git shortlog
  
  The `git shortlog` command is used to summarize the output of `git log`.
  It will take many of the same options that the `git log` command will but instead of listing out all of the commits it will present a summary of the commits grouped by author.
  
--We showed how to use it to create a nice changelog in <<ch05-distributed-git#_the_shortlog>>.
--
--==== git describe
-+We showed how to use it to create a nice changelog in <<ch05-distributed-git#r_the_shortlog>>.
+-We showed how to use it to create a nice changelog in <<ch05-distributed-git#r_the_shortlog>>.
++We showed how to use it to create a nice changelog in <<ch05-distributed-git#_the_shortlog>>.
++
++==== git describe
  
  The `git describe` command is used to take anything that resolves to a commit and produces a string that is somewhat human-readable and will not change.
  It's a way to get a description of a commit that is as unambiguous as a commit SHA-1 but more understandable.
  
--We use `git describe` in <<ch05-distributed-git#_build_number>> and <<ch05-distributed-git#_preparing_release>> to get a string to name our release file after.
--
-+We use `git describe` in <<ch05-distributed-git#r_build_number>> and <<ch05-distributed-git#r_preparing_release>> to get a string to name our release file after.
+-We use `git describe` in <<ch05-distributed-git#r_build_number>> and <<ch05-distributed-git#r_preparing_release>> to get a string to name our release file after.
++We use `git describe` in <<ch05-distributed-git#_build_number>> and <<ch05-distributed-git#_preparing_release>> to get a string to name our release file after.
++
  
  === Debugging
  
  Git has a couple of commands that are used to help debug an issue in your code.
  This ranges from figuring out where something was introduced to figuring out who introduced it.
  
--==== git bisect
--
++==== git bisect
++
  The `git bisect` tool is an incredibly helpful debugging tool used to find which specific commit was the first one to introduce a bug or problem by doing an automatic binary search.
  
--It is fully covered in <<ch07-git-tools#_binary_search>> and is only mentioned in that section.
--
--==== git blame
-+It is fully covered in <<ch07-git-tools#r_binary_search>> and is only mentioned in that section.
+-It is fully covered in <<ch07-git-tools#r_binary_search>> and is only mentioned in that section.
++It is fully covered in <<ch07-git-tools#_binary_search>> and is only mentioned in that section.
++
++==== git blame
  
  The `git blame` command annotates the lines of any file with which commit was the last one to introduce a change to each line of the file and what person authored that commit.
  This is helpful in order to find the person to ask for more information about a specific section of your code.
  
--It is covered in <<ch07-git-tools#_file_annotation>> and is only mentioned in that section.
--
--==== git grep
-+It is covered in <<ch07-git-tools#r_file_annotation>> and is only mentioned in that section.
+-It is covered in <<ch07-git-tools#r_file_annotation>> and is only mentioned in that section.
++It is covered in <<ch07-git-tools#_file_annotation>> and is only mentioned in that section.
++
++==== git grep
  
  The `git grep` command can help you find any string or regular expression in any of the files in your source code, even older versions of your project.
  
--It is covered in <<ch07-git-tools#_git_grep>> and is only mentioned in that section.
-+It is covered in <<ch07-git-tools#r_git_grep>> and is only mentioned in that section.
+-It is covered in <<ch07-git-tools#r_git_grep>> and is only mentioned in that section.
++It is covered in <<ch07-git-tools#_git_grep>> and is only mentioned in that section.
  
  === Patching
  
  A few commands in Git are centered around the concept of thinking of commits in terms of the changes they introduce, as though the commit series is a series of patches.
  These commands help you manage your branches in this manner.
  
--==== git cherry-pick
--
++==== git cherry-pick
++
  The `git cherry-pick` command is used to take the change introduced in a single Git commit and try to re-introduce it as a new commit on the branch you're currently on.
  This can be useful to only take one or two commits from a branch individually rather than merging in the branch which takes all the changes.
  
--Cherry picking is described and demonstrated in <<ch05-distributed-git#_rebase_cherry_pick>>.
--
--==== git rebase
-+Cherry picking is described and demonstrated in <<ch05-distributed-git#r_rebase_cherry_pick>>.
+-Cherry picking is described and demonstrated in <<ch05-distributed-git#r_rebase_cherry_pick>>.
++Cherry picking is described and demonstrated in <<ch05-distributed-git#_rebase_cherry_pick>>.
++
++==== git rebase
  
  The `git rebase` command is basically an automated `cherry-pick`.
  It determines a series of commits and then cherry-picks them one by one in the same order somewhere else.
  
--Rebasing is covered in detail in <<ch03-git-branching#_rebasing>>, including covering the collaborative issues involved with rebasing branches that are already public.
--
--We use it in practice during an example of splitting your history into two separate repositories in <<ch07-git-tools#_replace>>, using the `--onto` flag as well.
-+Rebasing is covered in detail in <<ch03-git-branching#r_rebasing>>, including covering the collaborative issues involved with rebasing branches that are already public.
+-Rebasing is covered in detail in <<ch03-git-branching#r_rebasing>>, including covering the collaborative issues involved with rebasing branches that are already public.
++Rebasing is covered in detail in <<ch03-git-branching#_rebasing>>, including covering the collaborative issues involved with rebasing branches that are already public.
++
++We use it in practice during an example of splitting your history into two separate repositories in <<ch07-git-tools#_replace>>, using the `--onto` flag as well.
  
--We go through running into a merge conflict during rebasing in <<ch07-git-tools#ref_rerere>>.
-+We use it in practice during an example of splitting your history into two separate repositories in <<ch07-git-tools#r_replace>>, using the `--onto` flag as well.
+-We use it in practice during an example of splitting your history into two separate repositories in <<ch07-git-tools#r_replace>>, using the `--onto` flag as well.
++We go through running into a merge conflict during rebasing in <<ch07-git-tools#ref_rerere>>.
  
--We also use it in an interactive scripting mode with the `-i` option in <<ch07-git-tools#_changing_multiple>>.
-+We go through running into a merge conflict during rebasing in <<ch07-git-tools#r_rerere>>.
+-We go through running into a merge conflict during rebasing in <<ch07-git-tools#r_rerere>>.
++We also use it in an interactive scripting mode with the `-i` option in <<ch07-git-tools#_changing_multiple>>.
  
--==== git revert
-+We also use it in an interactive scripting mode with the `-i` option in <<ch07-git-tools#r_changing_multiple>>.
+-We also use it in an interactive scripting mode with the `-i` option in <<ch07-git-tools#r_changing_multiple>>.
++==== git revert
  
  The `git revert` command is essentially a reverse `git cherry-pick`.
  It creates a new commit that applies the exact opposite of the change introduced in the commit you're targeting, essentially undoing or reverting it.
  
--We use this in <<ch07-git-tools#_reverse_commit>> to undo a merge commit.
-+We use this in <<ch07-git-tools#r_reverse_commit>> to undo a merge commit.
+-We use this in <<ch07-git-tools#r_reverse_commit>> to undo a merge commit.
++We use this in <<ch07-git-tools#_reverse_commit>> to undo a merge commit.
  
  === Email
  
  Many Git projects, including Git itself, are entirely maintained over mailing lists.
  Git has a number of tools built into it that help make this process easier, from generating patches you can easily email to applying those patches from an email box.
  
--==== git apply
--
++==== git apply
++
  The `git apply` command applies a patch created with the `git diff` or even GNU diff command.
  It is similar to what the `patch` command might do with a few small differences.
  
--We demonstrate using it and the circumstances in which you might do so in <<ch05-distributed-git#_patches_from_email>>.
--
--==== git am
-+We demonstrate using it and the circumstances in which you might do so in <<ch05-distributed-git#r_patches_from_email>>.
+-We demonstrate using it and the circumstances in which you might do so in <<ch05-distributed-git#r_patches_from_email>>.
++We demonstrate using it and the circumstances in which you might do so in <<ch05-distributed-git#_patches_from_email>>.
++
++==== git am
  
  The `git am` command is used to apply patches from an email inbox, specifically one that is mbox formatted.
  This is useful for receiving patches over email and applying them to your project easily.
  
--We covered usage and workflow around `git am` in <<ch05-distributed-git#_git_am>> including using the `--resolved`, `-i` and `-3` options.
-+We covered usage and workflow around `git am` in <<ch05-distributed-git#r_git_am>> including using the `--resolved`, `-i` and `-3` options.
+-We covered usage and workflow around `git am` in <<ch05-distributed-git#r_git_am>> including using the `--resolved`, `-i` and `-3` options.
++We covered usage and workflow around `git am` in <<ch05-distributed-git#_git_am>> including using the `--resolved`, `-i` and `-3` options.
  
--There are also a number of hooks you can use to help with the workflow around `git am` and they are all covered in <<ch08-customizing-git#_email_hooks>>.
-+There are also a number of hooks you can use to help with the workflow around `git am` and they are all covered in <<ch08-customizing-git#r_email_hooks>>.
+-There are also a number of hooks you can use to help with the workflow around `git am` and they are all covered in <<ch08-customizing-git#r_email_hooks>>.
++There are also a number of hooks you can use to help with the workflow around `git am` and they are all covered in <<ch08-customizing-git#_email_hooks>>.
  
--We also use it to apply patch formatted GitHub Pull Request changes in <<ch06-github#_email_notifications>>.
--
--==== git format-patch
-+We also use it to apply patch formatted GitHub Pull Request changes in <<ch06-github#r_email_notifications>>.
+-We also use it to apply patch formatted GitHub Pull Request changes in <<ch06-github#r_email_notifications>>.
++We also use it to apply patch formatted GitHub Pull Request changes in <<ch06-github#_email_notifications>>.
++
++==== git format-patch
  
  The `git format-patch` command is used to generate a series of patches in mbox format that you can use to send to a mailing list properly formatted.
  
--We go through an example of contributing to a project using the `git format-patch` tool in <<ch05-distributed-git#_project_over_email>>.
--
--==== git imap-send
-+We go through an example of contributing to a project using the `git format-patch` tool in <<ch05-distributed-git#r_project_over_email>>.
+-We go through an example of contributing to a project using the `git format-patch` tool in <<ch05-distributed-git#r_project_over_email>>.
++We go through an example of contributing to a project using the `git format-patch` tool in <<ch05-distributed-git#_project_over_email>>.
++
++==== git imap-send
  
  The `git imap-send` command uploads a mailbox generated with `git format-patch` into an IMAP drafts folder.
  
--We go through an example of contributing to a project by sending patches with the `git imap-send` tool in <<ch05-distributed-git#_project_over_email>>.
--
--==== git send-email
-+We go through an example of contributing to a project by sending patches with the `git imap-send` tool in <<ch05-distributed-git#r_project_over_email>>.
+-We go through an example of contributing to a project by sending patches with the `git imap-send` tool in <<ch05-distributed-git#r_project_over_email>>.
++We go through an example of contributing to a project by sending patches with the `git imap-send` tool in <<ch05-distributed-git#_project_over_email>>.
++
++==== git send-email
  
  The `git send-email` command is used to send patches that are generated with `git format-patch` over email.
  
--We go through an example of contributing to a project by sending patches with the `git send-email` tool in <<ch05-distributed-git#_project_over_email>>.
--
--==== git request-pull
-+We go through an example of contributing to a project by sending patches with the `git send-email` tool in <<ch05-distributed-git#r_project_over_email>>.
+-We go through an example of contributing to a project by sending patches with the `git send-email` tool in <<ch05-distributed-git#r_project_over_email>>.
++We go through an example of contributing to a project by sending patches with the `git send-email` tool in <<ch05-distributed-git#_project_over_email>>.
++
++==== git request-pull
  
  The `git request-pull` command is simply used to generate an example message body to email to someone.
  If you have a branch on a public server and want to let someone know how to integrate those changes without sending the patches over email, you can run this command and send the output to the person you want to pull the changes in.
  
--We demonstrate how to use `git request-pull` to generate a pull message in <<ch05-distributed-git#_public_project>>.
-+We demonstrate how to use `git request-pull` to generate a pull message in <<ch05-distributed-git#r_public_project>>.
+-We demonstrate how to use `git request-pull` to generate a pull message in <<ch05-distributed-git#r_public_project>>.
++We demonstrate how to use `git request-pull` to generate a pull message in <<ch05-distributed-git#_public_project>>.
  
  === External Systems
  
  Git comes with a few commands to integrate with other version control systems.
  
--==== git svn
--
++==== git svn
++
  The `git svn` command is used to communicate with the Subversion version control system as a client.
  This means you can use Git to checkout from and commit to a Subversion server.
  
--This command is covered in depth in <<ch09-git-and-other-systems#_git_svn>>.
--
--==== git fast-import
-+This command is covered in depth in <<ch09-git-and-other-scms#r_git_svn>>.
+-This command is covered in depth in <<ch09-git-and-other-scms#r_git_svn>>.
++This command is covered in depth in <<ch09-git-and-other-systems#_git_svn>>.
++
++==== git fast-import
  
  For other version control systems or importing from nearly any format, you can use `git fast-import` to quickly map the other format to something Git can easily record.
  
--This command is covered in depth in <<ch09-git-and-other-systems#_custom_importer>>.
-+This command is covered in depth in <<ch09-git-and-other-scms#r_custom_importer>>.
+-This command is covered in depth in <<ch09-git-and-other-scms#r_custom_importer>>.
++This command is covered in depth in <<ch09-git-and-other-systems#_custom_importer>>.
  
  === Administration
  
  If you're administering a Git repository or need to fix something in a big way, Git provides a number of administrative commands to help you out.
  
--==== git gc
--
++==== git gc
++
  The `git gc` command runs ``garbage collection'' on your repository, removing unnecessary files in your database and packing up the remaining files into a more efficient format.
  
  This command normally runs in the background for you, though you can manually run it if you wish.
--We go over some examples of this in <<ch10-git-internals#_git_gc>>.
--
--==== git fsck
-+We go over some examples of this in <<ch10-git-internals#r_git_gc>>.
+-We go over some examples of this in <<ch10-git-internals#r_git_gc>>.
++We go over some examples of this in <<ch10-git-internals#_git_gc>>.
++
++==== git fsck
  
  The `git fsck` command is used to check the internal database for problems or inconsistencies.
  
--We only quickly use this once in <<ch10-git-internals#_data_recovery>> to search for dangling objects.
--
--==== git reflog
-+We only quickly use this once in <<ch10-git-internals#r_data_recovery>> to search for dangling objects.
+-We only quickly use this once in <<ch10-git-internals#r_data_recovery>> to search for dangling objects.
++We only quickly use this once in <<ch10-git-internals#_data_recovery>> to search for dangling objects.
++
++==== git reflog
  
  The `git reflog` command goes through a log of where all the heads of your branches have been as you work to find commits you may have lost through rewriting histories.
  
--We cover this command mainly in <<ch07-git-tools#_git_reflog>>, where we show normal usage to and how to use `git log -g` to view the same information with `git log` output.
--
--We also go through a practical example of recovering such a lost branch in <<ch10-git-internals#_data_recovery>>.
-+We cover this command mainly in <<ch07-git-tools#r_git_reflog>>, where we show normal usage to and how to use `git log -g` to view the same information with `git log` output.
+-We cover this command mainly in <<ch07-git-tools#r_git_reflog>>, where we show normal usage to and how to use `git log -g` to view the same information with `git log` output.
++We cover this command mainly in <<ch07-git-tools#_git_reflog>>, where we show normal usage to and how to use `git log -g` to view the same information with `git log` output.
++
++We also go through a practical example of recovering such a lost branch in <<ch10-git-internals#_data_recovery>>.
  
--==== git filter-branch
-+We also go through a practical example of recovering such a lost branch in <<ch10-git-internals#r_data_recovery>>.
+-We also go through a practical example of recovering such a lost branch in <<ch10-git-internals#r_data_recovery>>.
++==== git filter-branch
  
  The `git filter-branch` command is used to rewrite loads of commits according to certain patterns, like removing a file everywhere or filtering the entire repository down to a single subdirectory for extracting a project.
  
--In <<ch07-git-tools#_removing_file_every_commit>> we explain the command and explore several different options such as `--commit-filter`, `--subdirectory-filter` and `--tree-filter`.
--
--In <<ch09-git-and-other-systems#_git_p4>> we use it to fix up imported external repositories.
-+In <<ch07-git-tools#r_removing_file_every_commit>> we explain the command and explore several different options such as `--commit-filter`, `--subdirectory-filter` and `--tree-filter`.
+-In <<ch07-git-tools#r_removing_file_every_commit>> we explain the command and explore several different options such as `--commit-filter`, `--subdirectory-filter` and `--tree-filter`.
++In <<ch07-git-tools#_removing_file_every_commit>> we explain the command and explore several different options such as `--commit-filter`, `--subdirectory-filter` and `--tree-filter`.
++
++In <<ch09-git-and-other-systems#_git_p4>> we use it to fix up imported external repositories.
  
-+In <<ch09-git-and-other-scms#r_git_p4>> and <<ch09-git-and-other-scms#r_git_tfs>> we use it to fix up imported external repositories.
+-In <<ch09-git-and-other-scms#r_git_p4>> and <<ch09-git-and-other-scms#r_git_tfs>> we use it to fix up imported external repositories.
  
  === Plumbing Commands
  
  There were also quite a number of lower level plumbing commands that we encountered in the book.
  
--The first one we encounter is `ls-remote` in <<ch06-github#_pr_refs>> which we use to look at the raw references on the server.
-+The first one we encounter is `ls-remote` in <<ch06-github#r_pr_refs>> which we use to look at the raw references on the server.
+-The first one we encounter is `ls-remote` in <<ch06-github#r_pr_refs>> which we use to look at the raw references on the server.
++The first one we encounter is `ls-remote` in <<ch06-github#_pr_refs>> which we use to look at the raw references on the server.
  
--We use `ls-files` in <<ch07-git-tools#_manual_remerge>>, <<ch07-git-tools#ref_rerere>> and <<ch07-git-tools#_the_index>> to take a more raw look at what your staging area looks like.
-+We use `ls-files` in <<ch07-git-tools#r_manual_remerge>>, <<ch07-git-tools#r_rerere>> and <<ch07-git-tools#r_the_index>> to take a more raw look at what your staging area looks like.
+-We use `ls-files` in <<ch07-git-tools#r_manual_remerge>>, <<ch07-git-tools#r_rerere>> and <<ch07-git-tools#r_the_index>> to take a more raw look at what your staging area looks like.
++We use `ls-files` in <<ch07-git-tools#_manual_remerge>>, <<ch07-git-tools#ref_rerere>> and <<ch07-git-tools#_the_index>> to take a more raw look at what your staging area looks like.
  
--We also mention `rev-parse` in <<ch07-git-tools#_branch_references>> to take just about any string and turn it into an object SHA-1.
-+We also mention `rev-parse` in <<ch07-git-tools#r_branch_references>> to take just about any string and turn it into an object SHA-1.
+-We also mention `rev-parse` in <<ch07-git-tools#r_branch_references>> to take just about any string and turn it into an object SHA-1.
++We also mention `rev-parse` in <<ch07-git-tools#_branch_references>> to take just about any string and turn it into an object SHA-1.
  
  However, most of the low level plumbing commands we cover are in <<ch10-git-internals#ch10-git-internals>>, which is more or less what the chapter is focused on.
  We tried to avoid use of them throughout most of the rest of the book.
-diff -au ../../git/progit2/progit2/LICENSE.asc /tmp/LICENSE.asc.tmp
---- ../../git/progit2/progit2/LICENSE.asc	2020-06-28 16:44:50.900011670 +0900
-+++ /tmp/LICENSE.asc.tmp	2020-10-25 09:24:25.552961813 +0900
-@@ -1,2 +0,0 @@
--This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
--To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/3.0 or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
-diff -au ../../git/progit2/progit2/README.asc /tmp/README.asc.tmp
---- ../../git/progit2/progit2/README.asc	2020-09-07 09:33:11.246683703 +0900
-+++ /tmp/README.asc.tmp	2020-10-25 09:24:25.563962332 +0900
-@@ -1,22 +1,51 @@
-+= Pro Git 第2版 日本語翻訳
-+
-+このリポジトリを使って、Pro Git第2版の日本語翻訳作業を進めています。
-+
-+- 翻訳を手伝ってみたい
-+- 書いてある技術的内容or日本語が間違ってるんだけど
-+- どうやって電子書籍データを生成してるんですか？
-+
-+などなど、興味を持っていただいた方を歓迎しています。何かありましたら https://github.com/progit/progit2-ja/issues/[Issue] をたてていただくか、メンテナの https://twitter.com/harupong[@harupong] までご連絡いただければ幸いです。
-+
-+== 翻訳作業のお約束
-+
-+翻訳のお手伝いは大歓迎です。以下の2点を踏まえ、ぜひご協力いただければと思っています。
-+
-+1. 作業を始めるときは意思表示をしてください
-+1. 既訳を尊重してください
-+
-+具体的な作業手順など、詳しいことは link:TRANSLATION_NOTES.asc[TRANSLATION NOTES] を確認してください。
-+
-+''''''''''''''''''''''''''
-+（Below is the translation of original README.asc in English. 以下は英語READMEの翻訳です。）
-+
+diff -au /tmp/LICENSE.asc.tmp ../../git/progit2/progit2/LICENSE.asc
+--- /tmp/LICENSE.asc.tmp	2020-10-25 11:05:02.088630679 +0900
++++ ../../git/progit2/progit2/LICENSE.asc	2020-06-28 16:44:50.900011670 +0900
+@@ -0,0 +1,2 @@
++This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
++To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/3.0 or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
+diff -au /tmp/README.asc.tmp ../../git/progit2/progit2/README.asc
+--- /tmp/README.asc.tmp	2020-10-25 11:05:02.092630904 +0900
++++ ../../git/progit2/progit2/README.asc	2020-09-07 09:33:11.246683703 +0900
+@@ -1,51 +1,22 @@
+-= Pro Git 第2版 日本語翻訳
+-
+-このリポジトリを使って、Pro Git第2版の日本語翻訳作業を進めています。
+-
+-- 翻訳を手伝ってみたい
+-- 書いてある技術的内容or日本語が間違ってるんだけど
+-- どうやって電子書籍データを生成してるんですか？
+-
+-などなど、興味を持っていただいた方を歓迎しています。何かありましたら https://github.com/progit/progit2-ja/issues/[Issue] をたてていただくか、メンテナの https://twitter.com/harupong[@harupong] までご連絡いただければ幸いです。
+-
+-== 翻訳作業のお約束
+-
+-翻訳のお手伝いは大歓迎です。以下の2点を踏まえ、ぜひご協力いただければと思っています。
+-
+-1. 作業を始めるときは意思表示をしてください
+-1. 既訳を尊重してください
+-
+-具体的な作業手順など、詳しいことは link:TRANSLATION_NOTES.asc[TRANSLATION NOTES] を確認してください。
+-
+-''''''''''''''''''''''''''
+-（Below is the translation of original README.asc in English. 以下は英語READMEの翻訳です。）
+-
  = Pro Git, Second Edition
  
  Welcome to the second edition of the Pro Git book.
  
--You can find this book online at: https://git-scm.com/book
-+You can find this book online at: http://git-scm.com/book
+-You can find this book online at: http://git-scm.com/book
++You can find this book online at: https://git-scm.com/book
  
  Like the first edition, the second edition of Pro Git is open source under a Creative Commons license.
  
  A couple of things have changed since open sourcing the first edition.
--For one, we've moved from Markdown to the amazing AsciiDoc format for the text of the book; here's an https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/[AsciiDoc quick reference].
-+For one, we've moved from Markdown to the amazing Asciidoc format for the text of the book.
-+We've also moved to using O'Reilly's https://atlas.oreilly.com[Atlas platform] for generating continuous builds of the book so all major formats are always available in every language.
+-For one, we've moved from Markdown to the amazing Asciidoc format for the text of the book.
+-We've also moved to using O'Reilly's https://atlas.oreilly.com[Atlas platform] for generating continuous builds of the book so all major formats are always available in every language.
++For one, we've moved from Markdown to the amazing AsciiDoc format for the text of the book; here's an https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/[AsciiDoc quick reference].
  
  We've also moved to keeping the translations in separate repositories rather than subdirectories of the English repository.
--See link:TRANSLATING.md[the translating document] for more information.
-+See link:CONTRIBUTING.md[the Contributing document] for more information.
+-See link:CONTRIBUTING.md[the Contributing document] for more information.
++See link:TRANSLATING.md[the translating document] for more information.
  
  == How To Generate the Book
  
--You can generate the e-book files manually with Asciidoctor.
--We used to be able to build .mobi files (Kindle), but cannot do so now, see #1496 for more information.
--If you run the following you _may_ actually get HTML, Epub and PDF output files:
-+There are two ways to generate e-book content from this source code.
-+
-+The easiest way is simply to let us do it.
-+A robot is standing by to look for new work on the main branch and automatically build it for everyone.
-+
-+You can find the current builds on http://git-scm.com/book[] and more information about the builds available at https://progit.org[].
-+
-+The other way to generate e-book files is to do so manually with Asciidoctor.
-+If you run the following you _may_ actually get HTML, Epub, Mobi and PDF output files:
+-There are two ways to generate e-book content from this source code.
+-
+-The easiest way is simply to let us do it.
+-A robot is standing by to look for new work on the main branch and automatically build it for everyone.
+-
+-You can find the current builds on http://git-scm.com/book[] and more information about the builds available at https://progit.org[].
+-
+-The other way to generate e-book files is to do so manually with Asciidoctor.
+-If you run the following you _may_ actually get HTML, Epub, Mobi and PDF output files:
++You can generate the e-book files manually with Asciidoctor.
++We used to be able to build .mobi files (Kindle), but cannot do so now, see #1496 for more information.
++If you run the following you _may_ actually get HTML, Epub and PDF output files:
  
  ----
  $ bundle install
-@@ -25,17 +54,20 @@
+@@ -54,20 +25,17 @@
   -- HTML output at progit.html
  Converting to EPub...
   -- Epub output at progit.epub
-+Converting to Mobi (kf8)...
-+ -- Mobi output at progit.mobi
+-Converting to Mobi (kf8)...
+- -- Mobi output at progit.mobi
  Converting to PDF...
-- -- PDF output at progit.pdf
-+ -- PDF  output at progit.pdf
+- -- PDF  output at progit.pdf
++ -- PDF output at progit.pdf
  ----
  
-+This uses the `asciidoctor`, `asciidoctor-pdf` and `asciidoctor-epub` projects.
-+
+-This uses the `asciidoctor`, `asciidoctor-pdf` and `asciidoctor-epub` projects.
+-
  == Signaling an Issue
  
  Before signaling an issue, please check that there isn't already a similar one in the bug tracking system.
  
--Also, if this issue has been spotted on the git-scm.com site, please cross-check that it is still present in this repo.
--The issue may have already been corrected, but the changes have not been deployed yet.
-+Also, if this issue has been spotted on the git-scm.com site, please cross-check that it is still present in the pdf version. The issue may have already been corrected, but the changes have not been deployed yet.
+-Also, if this issue has been spotted on the git-scm.com site, please cross-check that it is still present in the pdf version. The issue may have already been corrected, but the changes have not been deployed yet.
++Also, if this issue has been spotted on the git-scm.com site, please cross-check that it is still present in this repo.
++The issue may have already been corrected, but the changes have not been deployed yet.
  
  == Contributing
  
--If you'd like to help out by making a change, take a look at the link:CONTRIBUTING.md[contributor's guide].
-+If you'd like to help out by making a change or contributing a translation, take a look at the link:CONTRIBUTING.md[contributor's guide].
-diff -au ../../git/progit2/progit2/TRANSLATION_NOTES.asc /tmp/TRANSLATION_NOTES.asc.tmp
---- ../../git/progit2/progit2/TRANSLATION_NOTES.asc	2020-06-28 16:44:50.919014468 +0900
-+++ /tmp/TRANSLATION_NOTES.asc.tmp	2020-10-25 09:24:25.577962992 +0900
-@@ -1,11 +0,0 @@
--== Translation Notes
--
--After forking this repository to translate the work, this file is where the notes for coordinating the translation work would go.
--Things like standardizing on words and expressions so that the work is consistent or notes on how the contributing process is to be handled.
--
--As a translation maintainer, also feel free to modify or completely rewrite the README file to contain instructions specific to your translation.
--
--=== Translation Status
--
--As the work is translated, please update the `status.json` file to indicate the rough percentage complete each file is.
--This will be shown on various pages to let people know how much work is left to be done.
-diff -au ../../git/progit2/progit2/book/01-introduction/sections/about-version-control.asc /tmp/book/01-introduction/sections/about-version-control.asc.tmp
---- ../../git/progit2/progit2/book/01-introduction/sections/about-version-control.asc	2020-07-04 16:36:46.718685392 +0900
-+++ /tmp/book/01-introduction/sections/about-version-control.asc.tmp	2020-10-25 09:24:25.587963463 +0900
-@@ -1,60 +1,57 @@
+-If you'd like to help out by making a change or contributing a translation, take a look at the link:CONTRIBUTING.md[contributor's guide].
++If you'd like to help out by making a change, take a look at the link:CONTRIBUTING.md[contributor's guide].
+diff -au /tmp/TRANSLATION_NOTES.asc.tmp ../../git/progit2/progit2/TRANSLATION_NOTES.asc
+--- /tmp/TRANSLATION_NOTES.asc.tmp	2020-10-25 11:05:02.097631185 +0900
++++ ../../git/progit2/progit2/TRANSLATION_NOTES.asc	2020-06-28 16:44:50.919014468 +0900
+@@ -0,0 +1,11 @@
++== Translation Notes
++
++After forking this repository to translate the work, this file is where the notes for coordinating the translation work would go.
++Things like standardizing on words and expressions so that the work is consistent or notes on how the contributing process is to be handled.
++
++As a translation maintainer, also feel free to modify or completely rewrite the README file to contain instructions specific to your translation.
++
++=== Translation Status
++
++As the work is translated, please update the `status.json` file to indicate the rough percentage complete each file is.
++This will be shown on various pages to let people know how much work is left to be done.
+diff -au /tmp/book/01-introduction/sections/about-version-control.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/about-version-control.asc
+--- /tmp/book/01-introduction/sections/about-version-control.asc.tmp	2020-10-25 11:05:02.101631410 +0900
++++ ../../git/progit2/progit2/book/01-introduction/sections/about-version-control.asc	2020-07-04 16:36:46.718685392 +0900
+@@ -1,57 +1,60 @@
  === About Version Control
  
--(((version control)))
--What is ``version control'', and why should you care?
-+What is "version control", and why should you care?
+-What is "version control", and why should you care?
++(((version control)))
++What is ``version control'', and why should you care?
  Version control is a system that records changes to a file or set of files over time so that you can recall specific versions later.
--For the examples in this book, you will use software source code as the files being version controlled, though in reality you can do this with nearly any type of file on a computer.
-+For the examples in this book you will use software source code as the files being version controlled, though in reality you can do this with nearly any type of file on a computer.
+-For the examples in this book you will use software source code as the files being version controlled, though in reality you can do this with nearly any type of file on a computer.
++For the examples in this book, you will use software source code as the files being version controlled, though in reality you can do this with nearly any type of file on a computer.
  
  If you are a graphic or web designer and want to keep every version of an image or layout (which you would most certainly want to), a Version Control System (VCS) is a very wise thing to use.
--It allows you to revert selected files back to a previous state, revert the entire project back to a previous state, compare changes over time, see who last modified something that might be causing a problem, who introduced an issue and when, and more.
-+It allows you to revert files back to a previous state, revert the entire project back to a previous state, compare changes over time, see who last modified something that might be causing a problem, who introduced an issue and when, and more.
+-It allows you to revert files back to a previous state, revert the entire project back to a previous state, compare changes over time, see who last modified something that might be causing a problem, who introduced an issue and when, and more.
++It allows you to revert selected files back to a previous state, revert the entire project back to a previous state, compare changes over time, see who last modified something that might be causing a problem, who introduced an issue and when, and more.
  Using a VCS also generally means that if you screw things up or lose files, you can easily recover.
  In addition, you get all this for very little overhead.
  
  ==== Local Version Control Systems
  
--(((version control,local)))
++(((version control,local)))
  Many people's version-control method of choice is to copy files into another directory (perhaps a time-stamped directory, if they're clever).
  This approach is very common because it is so simple, but it is also incredibly error prone.
  It is easy to forget which directory you're in and accidentally write to the wrong file or copy over files you don't mean to.
  
  To deal with this issue, programmers long ago developed local VCSs that had a simple database that kept all the changes to files under revision control.
  
--.Local version control
-+.Local version control.
+-.Local version control.
++.Local version control
  image::images/local.png[Local version control diagram]
  
--One of the most popular VCS tools was a system called RCS, which is still distributed with many computers today.
--https://www.gnu.org/software/rcs/[RCS] works by keeping patch sets (that is, the differences between files) in a special format on disk; it can then re-create what any file looked like at any point in time by adding up all the patches.
-+One of the more popular VCS tools was a system called RCS, which is still distributed with many computers today.
-+Even the popular Mac OS X operating system includes the `rcs` command when you install the Developer Tools.
-+RCS works by keeping patch sets (that is, the differences between files) in a special format on disk; it can then re-create what any file looked like at any point in time by adding up all the patches.
+-One of the more popular VCS tools was a system called RCS, which is still distributed with many computers today.
+-Even the popular Mac OS X operating system includes the `rcs` command when you install the Developer Tools.
+-RCS works by keeping patch sets (that is, the differences between files) in a special format on disk; it can then re-create what any file looked like at any point in time by adding up all the patches.
++One of the most popular VCS tools was a system called RCS, which is still distributed with many computers today.
++https://www.gnu.org/software/rcs/[RCS] works by keeping patch sets (that is, the differences between files) in a special format on disk; it can then re-create what any file looked like at any point in time by adding up all the patches.
  
  ==== Centralized Version Control Systems
  
--(((version control,centralized)))
++(((version control,centralized)))
  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)))
+-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
-+.Centralized version control.
+-.Centralized version control.
++.Centralized version control
  image::images/centralized.png[Centralized version control diagram]
  
  This setup offers many advantages, especially over local VCSs.
  For example, everyone knows to a certain degree what everyone else on the project is doing.
--Administrators have fine-grained control over who can do what, and it's far easier to administer a CVCS than it is to deal with local databases on every client.
-+Administrators have fine-grained control over who can do what; and it's far easier to administer a CVCS than it is to deal with local databases on every client.
+-Administrators have fine-grained control over who can do what; and it's far easier to administer a CVCS than it is to deal with local databases on every client.
++Administrators have fine-grained control over who can do what, and it's far easier to administer a CVCS than it is to deal with local databases on every client.
  
  However, this setup also has some serious downsides.
  The most obvious is the single point of failure that the centralized server represents.
  If that server goes down for an hour, then during that hour nobody can collaborate at all or save versioned changes to anything they're working on.
--If the hard disk the central database is on becomes corrupted, and proper backups haven't been kept, you lose absolutely everything -- the entire history of the project except whatever single snapshots people happen to have on their local machines.
--Local VCS systems suffer from this same problem -- whenever you have the entire history of the project in a single place, you risk losing everything.
-+If the hard disk the central database is on becomes corrupted, and proper backups haven't been kept, you lose absolutely everything – the entire history of the project except whatever single snapshots people happen to have on their local machines.
-+Local VCS systems suffer from this same problem – whenever you have the entire history of the project in a single place, you risk losing everything.
+-If the hard disk the central database is on becomes corrupted, and proper backups haven't been kept, you lose absolutely everything – the entire history of the project except whatever single snapshots people happen to have on their local machines.
+-Local VCS systems suffer from this same problem – whenever you have the entire history of the project in a single place, you risk losing everything.
++If the hard disk the central database is on becomes corrupted, and proper backups haven't been kept, you lose absolutely everything -- the entire history of the project except whatever single snapshots people happen to have on their local machines.
++Local VCS systems suffer from this same problem -- whenever you have the entire history of the project in a single place, you risk losing everything.
  
  ==== Distributed Version Control Systems
  
--(((version control,distributed)))
++(((version control,distributed)))
  This is where Distributed Version Control Systems (DVCSs) step in.
--In a DVCS (such as Git, Mercurial, Bazaar or Darcs), clients don't just check out the latest snapshot of the files; rather, they fully mirror the repository, including its full history.
--Thus, if any server dies, and these systems were collaborating via that server, any of the client repositories can be copied back up to the server to restore it.
-+In a DVCS (such as Git, Mercurial, Bazaar or Darcs), clients don't just check out the latest snapshot of the files: they fully mirror the repository.
-+Thus if any server dies, and these systems were collaborating via it, any of the client repositories can be copied back up to the server to restore it.
+-In a DVCS (such as Git, Mercurial, Bazaar or Darcs), clients don't just check out the latest snapshot of the files: they fully mirror the repository.
+-Thus if any server dies, and these systems were collaborating via it, any of the client repositories can be copied back up to the server to restore it.
++In a DVCS (such as Git, Mercurial, Bazaar or Darcs), clients don't just check out the latest snapshot of the files; rather, they fully mirror the repository, including its full history.
++Thus, if any server dies, and these systems were collaborating via that server, any of the client repositories can be copied back up to the server to restore it.
  Every clone is really a full backup of all the data.
  
--.Distributed version control
-+.Distributed version control.
+-.Distributed version control.
++.Distributed version control
  image::images/distributed.png[Distributed version control diagram]
  
  Furthermore, many of these systems deal pretty well with having several remote repositories they can work with, so you can collaborate with different groups of people in different ways simultaneously within the same project.
-diff -au ../../git/progit2/progit2/book/01-introduction/sections/command-line.asc /tmp/book/01-introduction/sections/command-line.asc.tmp
---- ../../git/progit2/progit2/book/01-introduction/sections/command-line.asc	2020-06-28 16:44:50.920014615 +0900
-+++ /tmp/book/01-introduction/sections/command-line.asc.tmp	2020-10-25 09:24:25.591963652 +0900
+diff -au /tmp/book/01-introduction/sections/command-line.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/command-line.asc
+--- /tmp/book/01-introduction/sections/command-line.asc.tmp	2020-10-25 11:05:02.106631691 +0900
++++ ../../git/progit2/progit2/book/01-introduction/sections/command-line.asc	2020-06-28 16:44:50.920014615 +0900
 @@ -1,11 +1,11 @@
  === The Command Line
  
  There are a lot of different ways to use Git.
--There are the original command-line tools, and there are many graphical user interfaces of varying capabilities.
-+There are the original command line tools, and there are many graphical user interfaces of varying capabilities.
+-There are the original command line tools, and there are many graphical user interfaces of varying capabilities.
++There are the original command-line tools, and there are many graphical user interfaces of varying capabilities.
  For this book, we will be using Git on the command line.
--For one, the command line is the only place you can run _all_ Git commands -- most of the GUIs implement only a partial subset of Git functionality for simplicity.
--If you know how to run the command-line version, you can probably also figure out how to run the GUI version, while the opposite is not necessarily true.
-+For one, the command line is the only place you can run *all* Git commands – most of the GUIs only implement some subset of Git functionality for simplicity.
-+If you know how to run the command line version, you can probably also figure out how to run the GUI version, while the opposite is not necessarily true.
+-For one, the command line is the only place you can run *all* Git commands – most of the GUIs only implement some subset of Git functionality for simplicity.
+-If you know how to run the command line version, you can probably also figure out how to run the GUI version, while the opposite is not necessarily true.
++For one, the command line is the only place you can run _all_ Git commands -- most of the GUIs implement only a partial subset of Git functionality for simplicity.
++If you know how to run the command-line version, you can probably also figure out how to run the GUI version, while the opposite is not necessarily true.
  Also, while your choice of graphical client is a matter of personal taste, _all_ users will have the command-line tools installed and available.
  
--So we will expect you to know how to open Terminal in macOS or Command Prompt or PowerShell in Windows.
-+So we will expect you to know how to open Terminal in Mac or Command Prompt or Powershell in Windows.
+-So we will expect you to know how to open Terminal in Mac or Command Prompt or Powershell in Windows.
++So we will expect you to know how to open Terminal in macOS or Command Prompt or PowerShell in Windows.
  If you don't know what we're talking about here, you may need to stop and research that quickly so that you can follow the rest of the examples and descriptions in this book.
-diff -au ../../git/progit2/progit2/book/01-introduction/sections/first-time-setup.asc /tmp/book/01-introduction/sections/first-time-setup.asc.tmp
---- ../../git/progit2/progit2/book/01-introduction/sections/first-time-setup.asc	2020-08-10 10:02:15.168231103 +0900
-+++ /tmp/book/01-introduction/sections/first-time-setup.asc.tmp	2020-10-25 09:24:25.597963934 +0900
+diff -au /tmp/book/01-introduction/sections/first-time-setup.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/first-time-setup.asc
+--- /tmp/book/01-introduction/sections/first-time-setup.asc.tmp	2020-10-25 11:05:02.111631973 +0900
++++ ../../git/progit2/progit2/book/01-introduction/sections/first-time-setup.asc	2020-08-10 10:02:15.168231103 +0900
 @@ -1,4 +1,4 @@
--[[_first_time]]
-+[[r_first_time]]
+-[[r_first_time]]
++[[_first_time]]
  === 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.
-@@ -8,129 +8,58 @@
+@@ -8,58 +8,129 @@
  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 commands, config)))
  These variables can be stored in three different places:
  
--1. `[path]/etc/gitconfig` file: Contains values applied to every user on the system and all their repositories.
-+1. `/etc/gitconfig` file: Contains values for every user on the system and all their repositories.
+-1. `/etc/gitconfig` file: Contains values for every user on the system and all their repositories.
++1. `[path]/etc/gitconfig` file: Contains values applied to 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.
--  Because this is a system configuration file, you would need administrative or superuser privilege to make changes to it.
--2. `~/.gitconfig` or `~/.config/git/config` file: Values specific personally to you, the user.
--  You can make Git read and write to this file specifically by passing the `--global` option, and this affects _all_ of the repositories you work with on your system.
-+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.
+-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.
++  Because this is a system configuration file, you would need administrative or superuser privilege to make changes to it.
++2. `~/.gitconfig` or `~/.config/git/config` file: Values specific personally to you, the user.
++  You can make Git read and write to this file specifically by passing the `--global` option, and this affects _all_ of the repositories you work with on your system.
  3. `config` file in the Git directory (that is, `.git/config`) of whatever repository you're currently using: Specific to that single repository.
--  You can force Git to read from and write to this file with the `--local` option, but that is in fact the default.
--  Unsurprisingly, you need to be located somewhere in a Git repository for this option to work properly.
++  You can force Git to read from and write to this file with the `--local` option, but that is in fact the default.
++  Unsurprisingly, you need to be located somewhere in a Git repository for this option to work properly.
  
--Each level overrides values in the previous level, so values in `.git/config` trump those in `[path]/etc/gitconfig`.
-+Each level overrides values in the previous level, so values in `.git/config` trump those in `/etc/gitconfig`.
+-Each level overrides values in the previous level, so values in `.git/config` trump those in `/etc/gitconfig`.
++Each level overrides values in the previous level, so values in `.git/config` trump those in `[path]/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 `[path]/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.
--If you are using version 2.x or later of Git for Windows, there is also a system-level config file at
-+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.
-+If you are using Git for Windows 2.x or later, there is also a system-level config file at
+-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.
+-If you are using Git for Windows 2.x or later, there is also a system-level config file at
++It also still looks for `[path]/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.
++If you are using version 2.x or later of Git for Windows, there is also a system-level config file at
  `C:\Documents and Settings\All Users\Application Data\Git\config` on Windows XP, and in `C:\ProgramData\Git\config` on Windows Vista and newer.
  This config file can only be changed by `git config -f <file>` as an admin.
  
--You can view all of your settings and where they are coming from using:
--
--[source,console]
------
--$ git config --list --show-origin
------
--
++You can view all of your settings and where they are coming from using:
++
++[source,console]
++----
++$ git config --list --show-origin
++----
++
  ==== Your Identity
  
  The first thing you should do when you install Git is to set your user name and email address.
  This is important because every Git commit uses this information, and it's immutably baked into the commits you start creating:
  
--[source,console]
------
--$ git config --global user.name "John Doe"
--$ git config --global user.email [e-mail]
------
--
++[source,console]
++----
++$ git config --global user.name "John Doe"
++$ git config --global user.email [e-mail]
++----
++
  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.
-+<<<<<<< HEAD
+-<<<<<<< HEAD
  If you want to override this with a different name or email 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.
  
--[[_editor]]
++[[_editor]]
  ==== 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.
  If not configured, Git uses your system's default editor.
--
- If you want to use a different text editor, such as Emacs, you can do the following:
+-If you want to use a different text editor, such as Emacs, you can do the following:
  
--[source,console]
------
--$ git config --global core.editor emacs
------
+-While on a Windows system, if you want to use a different text editor, such as Notepad++, you can do the following:
 -
--On a Windows system, if you want to use a different text editor, you must specify the full path to its executable file.
--This can be different depending on how your editor is packaged.
--
--In the case of Notepad++, a popular programming editor, you are likely to want to use the 32-bit version, since at the time of writing the 64-bit version doesn't support all plug-ins.
--If you are on a 32-bit Windows system, or you have a 64-bit editor on a 64-bit system, you'll type something like this:
--
--[source,console]
------
--$ git config --global core.editor "'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"
------
-+While on a Windows system, if you want to use a different text editor, such as Notepad++, you can do the following:
+-On a x86 system
++If you want to use a different text editor, such as Emacs, you can do the following:
+ 
+-On a x64 system
++[source,console]
++----
++$ git config --global core.editor emacs
++----
++
++On a Windows system, if you want to use a different text editor, you must specify the full path to its executable file.
++This can be different depending on how your editor is packaged.
 +
-+On a x86 system
++In the case of Notepad++, a popular programming editor, you are likely to want to use the 32-bit version, since at the time of writing the 64-bit version doesn't support all plug-ins.
++If you are on a 32-bit Windows system, or you have a 64-bit editor on a 64-bit system, you'll type something like this:
 +
-+On a x64 system
++[source,console]
++----
++$ git config --global core.editor "'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"
++----
  
--[NOTE]
++[NOTE]
  ====
--Vim, Emacs and Notepad++ are popular text editors often used by developers on Unix-based systems like Linux and macOS or a Windows system.
--If you are using another editor, or a 32-bit version, please find specific instructions for how to set up your favorite editor with Git in <<C-git-commands#_core_editor>>.
-+Vim, Emacs and Notepad++ are popular text editors often used by developers on Unix based systems like Linux and OS X or a Windows system.
-+If you are not familiar with either of these editors, you may need to search for specific instructions for how to set up your favorite editor with Git.
+-Vim, Emacs and Notepad++ are popular text editors often used by developers on Unix based systems like Linux and OS X or a Windows system.
+-If you are not familiar with either of these editors, you may need to search for specific instructions for how to set up your favorite editor with Git.
++Vim, Emacs and Notepad++ are popular text editors often used by developers on Unix-based systems like Linux and macOS or a Windows system.
++If you are using another editor, or a 32-bit version, please find specific instructions for how to set up your favorite editor with Git in <<C-git-commands#_core_editor>>.
  ====
  
--[WARNING]
++[WARNING]
  ====
--You may find, if you don't setup your editor like this, you get into a really confusing state when Git attempts to launch it.
--An example on a Windows system may include a prematurely terminated Git operation during a Git initiated edit.
-+You may find, if you don't setup an editor like this, you will likely get into a really confusing state when they are launched.
-+Such example on a Windows system may include a prematurely terminated Git operation during a Git initiated edit.
+-You may find, if you don't setup an editor like this, you will likely get into a really confusing state when they are launched.
+-Such example on a Windows system may include a prematurely terminated Git operation during a Git initiated edit.
++You may find, if you don't setup your editor like this, you get into a really confusing state when Git attempts to launch it.
++An example on a Windows system may include a prematurely terminated Git operation during a Git initiated edit.
  ====
  
--==== Your default branch name
--
--By default Git will create a branch called _master_ when you create a new repository with `git init`.
--From Git version 2.28 onwards, you can set a different name for the initial branch.
--
--To set _main_ as the default branch name do:
--
--[source,console]
------
--$ git config --global init.defaultBranch main
------
--
++==== Your default branch name
++
++By default Git will create a branch called _master_ when you create a new repository with `git init`.
++From Git version 2.28 onwards, you can set a different name for the initial branch.
++
++To set _main_ as the default branch name do:
++
++[source,console]
++----
++$ git config --global init.defaultBranch main
++----
++
  ==== Checking Your Settings
  
--If you want to check your configuration settings, you can use the `git config --list` command to list all the settings Git can find at that point:
-+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:
+-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:
++If you want to check your configuration settings, you can use the `git config --list` command to list all the settings Git can find at that point:
  
--[source,console]
------
--$ git config --list
--user.name=John Doe
--user.email=[e-mail]
--color.status=auto
--color.branch=auto
--color.interactive=auto
--color.diff=auto
--...
------
--
--You may see keys more than once, because Git reads the same key from different files (`[path]/etc/gitconfig` and `~/.gitconfig`, for example).
-+You may see keys more than once, because Git reads the same key from different files (`/etc/gitconfig` and `~/.gitconfig`, for example).
+-You may see keys more than once, because Git reads the same key from different files (`/etc/gitconfig` and `~/.gitconfig`, for example).
++[source,console]
++----
++$ git config --list
++user.name=John Doe
++user.email=[e-mail]
++color.status=auto
++color.branch=auto
++color.interactive=auto
++color.diff=auto
++...
++----
++
++You may see keys more than once, because Git reads the same key from different files (`[path]/etc/gitconfig` and `~/.gitconfig`, for example).
  In this case, Git uses the last value for each unique key it sees.
  
  You can also check what Git thinks a specific key's value is by typing `git config <key>`:(((git commands, config)))
--
--[source,console]
------
--$ git config user.name
--John Doe
------
--
--[NOTE]
--====
--Since Git might read the same configuration variable value from more than one file, it's possible that you have an unexpected value for one of these values and you don't know why.
--In cases like that, you can query Git as to the _origin_ for that value, and it will tell you which configuration file had the final say in setting that value:
--
--[source,console]
------
--$ git config --show-origin rerere.autoUpdate
--file:/home/johndoe/.gitconfig	false
------
--====
-diff -au ../../git/progit2/progit2/book/01-introduction/sections/help.asc /tmp/book/01-introduction/sections/help.asc.tmp
---- ../../git/progit2/progit2/book/01-introduction/sections/help.asc	2020-07-04 16:36:46.718685392 +0900
-+++ /tmp/book/01-introduction/sections/help.asc.tmp	2020-10-25 09:24:25.601964123 +0900
-@@ -1,48 +1,10 @@
--[[_git_help]]
-+[[r_git_help]]
++
++[source,console]
++----
++$ git config user.name
++John Doe
++----
++
++[NOTE]
++====
++Since Git might read the same configuration variable value from more than one file, it's possible that you have an unexpected value for one of these values and you don't know why.
++In cases like that, you can query Git as to the _origin_ for that value, and it will tell you which configuration file had the final say in setting that value:
++
++[source,console]
++----
++$ git config --show-origin rerere.autoUpdate
++file:/home/johndoe/.gitconfig	false
++----
++====
+diff -au /tmp/book/01-introduction/sections/help.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/help.asc
+--- /tmp/book/01-introduction/sections/help.asc.tmp	2020-10-25 11:05:02.116632254 +0900
++++ ../../git/progit2/progit2/book/01-introduction/sections/help.asc	2020-07-04 16:36:46.718685392 +0900
+@@ -1,10 +1,48 @@
+-[[r_git_help]]
++[[_git_help]]
  === Getting Help
  
--If you ever need help while using Git, there are three equivalent ways to get the comprehensive manual page (manpage) help for any of the Git commands:
-+If you ever need help while using Git, there are three ways to get the manual page (manpage) help for any of the Git commands:
+-If you ever need help while using Git, there are three ways to get the manual page (manpage) help for any of the Git commands:
++If you ever need help while using Git, there are three equivalent ways to get the comprehensive manual page (manpage) help for any of the Git commands:
  
--[source,console]
------
--$ git help <verb>
--$ git <verb> --help
--$ man git-<verb>
------
--
--For example, you can get the manpage help for the `git config` command by running this:(((git commands, help)))
--
--[source,console]
------
--$ git help config
------
-+For example, you can get the manpage help for the config command by running(((git commands, help)))
+-For example, you can get the manpage help for the config command by running(((git commands, help)))
++[source,console]
++----
++$ git help <verb>
++$ git <verb> --help
++$ man git-<verb>
++----
++
++For example, you can get the manpage help for the `git config` command by running this:(((git commands, help)))
++
++[source,console]
++----
++$ git help config
++----
  
  These commands are nice because you can access them anywhere, even offline.
--If the manpages and this book aren't enough and you need in-person help, you can try the `#git` or `#github` channel on the Freenode IRC server, which can be found at https://freenode.net[].
-+If the manpages and this book aren't enough and you need in-person help, you can try the `#git` or `#github` channel on the Freenode IRC server (irc.freenode.net).
+-If the manpages and this book aren't enough and you need in-person help, you can try the `#git` or `#github` channel on the Freenode IRC server (irc.freenode.net).
++If the manpages and this book aren't enough and you need in-person help, you can try the `#git` or `#github` channel on the Freenode IRC server, which can be found at https://freenode.net[].
  These channels are regularly filled with hundreds of people who are all very knowledgeable about Git and are often willing to help.(((IRC)))
--
--In addition, if you don't need the full-blown manpage help, but just need a quick refresher on the available options for a Git command, you can ask for the more concise ``help'' output with the `-h` option, as in:
--
--[source,console]
------
--$ git add -h
--usage: git add [<options>] [--] <pathspec>...
--
--    -n, --dry-run         dry run
--    -v, --verbose         be verbose
--
--    -i, --interactive     interactive picking
--    -p, --patch           select hunks interactively
--    -e, --edit            edit current diff and apply
--    -f, --force           allow adding otherwise ignored files
--    -u, --update          update tracked files
--    --renormalize         renormalize EOL of tracked files (implies -u)
--    -N, --intent-to-add   record only the fact that the path will be added later
--    -A, --all             add changes from all tracked and untracked files
--    --ignore-removal      ignore paths removed in the working tree (same as --no-all)
--    --refresh             don't add, only refresh the index
--    --ignore-errors       just skip files which cannot be added because of errors
--    --ignore-missing      check if - even missing - files are ignored in dry run
--    --chmod (+|-)x        override the executable bit of the listed files
------
--
-diff -au ../../git/progit2/progit2/book/01-introduction/sections/history.asc /tmp/book/01-introduction/sections/history.asc.tmp
---- ../../git/progit2/progit2/book/01-introduction/sections/history.asc	2020-06-28 16:44:50.921014763 +0900
-+++ /tmp/book/01-introduction/sections/history.asc.tmp	2020-10-25 09:24:25.607964406 +0900
++
++In addition, if you don't need the full-blown manpage help, but just need a quick refresher on the available options for a Git command, you can ask for the more concise ``help'' output with the `-h` option, as in:
++
++[source,console]
++----
++$ git add -h
++usage: git add [<options>] [--] <pathspec>...
++
++    -n, --dry-run         dry run
++    -v, --verbose         be verbose
++
++    -i, --interactive     interactive picking
++    -p, --patch           select hunks interactively
++    -e, --edit            edit current diff and apply
++    -f, --force           allow adding otherwise ignored files
++    -u, --update          update tracked files
++    --renormalize         renormalize EOL of tracked files (implies -u)
++    -N, --intent-to-add   record only the fact that the path will be added later
++    -A, --all             add changes from all tracked and untracked files
++    --ignore-removal      ignore paths removed in the working tree (same as --no-all)
++    --refresh             don't add, only refresh the index
++    --ignore-errors       just skip files which cannot be added because of errors
++    --ignore-missing      check if - even missing - files are ignored in dry run
++    --chmod (+|-)x        override the executable bit of the listed files
++----
++
+diff -au /tmp/book/01-introduction/sections/history.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/history.asc
+--- /tmp/book/01-introduction/sections/history.asc.tmp	2020-10-25 11:05:02.120632479 +0900
++++ ../../git/progit2/progit2/book/01-introduction/sections/history.asc	2020-06-28 16:44:50.921014763 +0900
 @@ -17,4 +17,4 @@
  *  Able to handle large projects like the Linux kernel efficiently (speed and data size)
  
  Since its birth in 2005, Git has evolved and matured to be easy to use and yet retain these initial qualities.
--It's amazingly fast, it's very efficient with large projects, and it has an incredible branching system for non-linear development (See <<ch03-git-branching#ch03-git-branching>>).
-+It's incredibly fast, it's very efficient with large projects, and it has an incredible branching system for non-linear development (See <<ch03-git-branching#ch03-git-branching>>).
-diff -au ../../git/progit2/progit2/book/01-introduction/sections/installing.asc /tmp/book/01-introduction/sections/installing.asc.tmp
---- ../../git/progit2/progit2/book/01-introduction/sections/installing.asc	2020-07-04 16:36:46.718685392 +0900
-+++ /tmp/book/01-introduction/sections/installing.asc.tmp	2020-10-25 09:24:25.611964594 +0900
-@@ -4,144 +4,69 @@
+-It's incredibly fast, it's very efficient with large projects, and it has an incredible branching system for non-linear development (See <<ch03-git-branching#ch03-git-branching>>).
++It's amazingly fast, it's very efficient with large projects, and it has an incredible branching system for non-linear development (See <<ch03-git-branching#ch03-git-branching>>).
+diff -au /tmp/book/01-introduction/sections/installing.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/installing.asc
+--- /tmp/book/01-introduction/sections/installing.asc.tmp	2020-10-25 11:05:02.125632760 +0900
++++ ../../git/progit2/progit2/book/01-introduction/sections/installing.asc	2020-07-04 16:36:46.718685392 +0900
+@@ -4,69 +4,144 @@
  Even if it's already installed, it's probably a good idea to update to the latest version.
  You can either install it as a package or via another installer, or download the source code and compile it yourself.
  
--[NOTE]
++[NOTE]
  ====
--This book was written using Git version *2.8.0*.
-+This book was written using Git version *2.0.0*.
+-This book was written using Git version *2.0.0*.
++This book was written using Git version *2.8.0*.
  Though most of the commands we use should work even in ancient versions of Git, some of them might not or might act slightly differently if you're using an older version.
--Since Git is quite excellent at preserving backwards compatibility, any version after 2.8 should work just fine.
-+Since Git is quite excellent at preserving backwards compatibility, any version after 2.0 should work just fine.
+-Since Git is quite excellent at preserving backwards compatibility, any version after 2.0 should work just fine.
++Since Git is quite excellent at preserving backwards compatibility, any version after 2.8 should work just fine.
  ====
  
  ==== Installing on Linux
  
--(((Linux, installing)))
--If you want to install the basic Git tools on Linux via a binary installer, you can generally do so through the package management tool that comes with your distribution.
--If you're on Fedora (or any closely-related RPM-based distribution, such as RHEL or CentOS), you can use `dnf`:
-+If you want to install the basic Git tools 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 for example, you can use yum:
+-If you want to install the basic Git tools 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 for example, you can use yum:
++(((Linux, installing)))
++If you want to install the basic Git tools on Linux via a binary installer, you can generally do so through the package management tool that comes with your distribution.
++If you're on Fedora (or any closely-related RPM-based distribution, such as RHEL or CentOS), you can use `dnf`:
  
--[source,console]
------
--$ sudo dnf install git-all
------
-+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:
++[source,console]
++----
++$ sudo dnf install git-all
++----
  
--If you're on a Debian-based distribution, such as Ubuntu, try `apt`:
-+For more options, there are instructions for installing on several different Unix flavors on the Git website, at http://git-scm.com/download/linux[].
+-For more options, there are instructions for installing on several different Unix flavors on the Git website, at http://git-scm.com/download/linux[].
++If you're on a Debian-based distribution, such as Ubuntu, try `apt`:
  
--[source,console]
------
--$ sudo apt install git-all
------
-+==== Installing on Mac
+-==== Installing on Mac
++[source,console]
++----
++$ sudo apt install git-all
++----
  
--For more options, there are instructions for installing on several different Unix distributions on the Git website, at https://git-scm.com/download/linux[].
--
--==== Installing on macOS
--
--(((macOS, installing)))
++For more options, there are instructions for installing on several different Unix distributions on the Git website, at https://git-scm.com/download/linux[].
++
++==== Installing on macOS
++
++(((macOS, installing)))
  There are several ways to install Git on a Mac.
  The easiest is probably to install the Xcode Command Line Tools.(((Xcode)))
--On Mavericks (10.9) or above you can do this simply by trying to run `git` from the Terminal the very first time.
--
--[source,console]
------
--$ git --version
------
--
-+On Mavericks (10.9) or above you can do this simply by trying to run 'git' from the Terminal the very first time.
+-On Mavericks (10.9) or above you can do this simply by trying to run 'git' from the Terminal the very first time.
++On Mavericks (10.9) or above you can do this simply by trying to run `git` from the Terminal the very first time.
++
++[source,console]
++----
++$ git --version
++----
++
  If you don't have it installed already, it will prompt you to install it.
  
  If you want a more up to date version, you can also install it via a binary installer.
--A macOS Git installer is maintained and available for download at the Git website, at https://git-scm.com/download/mac[].
-+An OSX Git installer is maintained and available for download at the Git website, at http://git-scm.com/download/mac[].
+-An OSX Git installer is maintained and available for download at the Git website, at http://git-scm.com/download/mac[].
++A macOS Git installer is maintained and available for download at the Git website, at https://git-scm.com/download/mac[].
  
--.Git macOS Installer
--image::images/git-osx-installer.png[Git macOS installer]
-+.Git OS X Installer.
-+image::images/git-osx-installer.png[Git OS X installer.]
+-.Git OS X Installer.
+-image::images/git-osx-installer.png[Git OS X installer.]
++.Git macOS Installer
++image::images/git-osx-installer.png[Git macOS installer]
  
--You can also install it as part of the GitHub for macOS install.
-+You can also install it as part of the GitHub for Mac install.
+-You can also install it as part of the GitHub for Mac install.
++You can also install it as part of the GitHub for macOS install.
  Their GUI Git tool has an option to install command line tools as well.
--You can download that tool from the GitHub for macOS website, at https://desktop.github.com[].
-+You can download that tool from the GitHub for Mac website, at http://mac.github.com[].
+-You can download that tool from the GitHub for Mac website, at http://mac.github.com[].
++You can download that tool from the GitHub for macOS website, at https://desktop.github.com[].
  
  ==== Installing on Windows
  
  There are also a few ways to install Git on Windows.(((Windows, installing)))
  The most official build is available for download on the Git website.
--Just go to https://git-scm.com/download/win[] and the download will start automatically.
--Note that this is a project called Git for Windows, which is separate from Git itself; for more information on it, go to https://gitforwindows.org[].
--
--To get an automated installation you can use the https://chocolatey.org/packages/git[Git Chocolatey package].
--Note that the Chocolatey package is community maintained.
-+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, which is separate from Git itself; for more information on it, go to https://git-for-windows.github.io/[].
+-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, which is separate from Git itself; for more information on it, go to https://git-for-windows.github.io/[].
++Just go to https://git-scm.com/download/win[] and the download will start automatically.
++Note that this is a project called Git for Windows, which is separate from Git itself; for more information on it, go to https://gitforwindows.org[].
++
++To get an automated installation you can use the https://chocolatey.org/packages/git[Git Chocolatey package].
++Note that the Chocolatey package is community maintained.
  
--Another easy way to get Git installed is by installing GitHub Desktop.
-+Another easy way to get Git installed is by installing GitHub for Windows.
+-Another easy way to get Git installed is by installing GitHub for Windows.
++Another easy way to get Git installed is by installing GitHub Desktop.
  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.(((PowerShell)))(((CRLF)))(((credential caching)))
-+It also works well with Powershell, and sets up solid credential caching and sane CRLF settings.(((Powershell)))(((CRLF)))(((credential caching)))
+-It also works well with Powershell, and sets up solid credential caching and sane CRLF settings.(((Powershell)))(((CRLF)))(((credential caching)))
++It also works well with PowerShell, and sets up solid credential caching and sane CRLF settings.(((PowerShell)))(((CRLF)))(((credential caching)))
  We'll learn more about those things a little later, but suffice it to say they're things you want.
--You can download this from the https://desktop.github.com[GitHub Desktop website].
-+You can download this from the GitHub for Windows website, at http://windows.github.com[].
+-You can download this from the GitHub for Windows website, at http://windows.github.com[].
++You can download this from the https://desktop.github.com[GitHub Desktop website].
  
  ==== Installing from Source
  
  Some people may instead find it useful to install Git from source, because you'll get the most recent version.
  The binary installers tend to be a bit behind, though as Git has matured in recent years, this has made less of a difference.
  
--If you do want to install Git from source, you need to have the following libraries that Git depends on: autotools, curl, zlib, openssl, expat, and libiconv.
--For example, if you're on a system that has `dnf` (such as Fedora) or `apt-get` (such as a Debian-based system), you can use one of these commands to install the minimal dependencies for compiling and installing the Git binaries:
-+If you do want to install Git from source, you need to have the following libraries that Git depends on: curl, zlib, openssl, expat, and libiconv.
-+For example, if you're on a system that has yum (such as Fedora) or apt-get (such as a Debian based system), you can use one of these commands to install the minimal dependencies for compiling and installing the Git binaries:
+-If you do want to install Git from source, you need to have the following libraries that Git depends on: curl, zlib, openssl, expat, and libiconv.
+-For example, if you're on a system that has yum (such as Fedora) or apt-get (such as a Debian based system), you can use one of these commands to install the minimal dependencies for compiling and installing the Git binaries:
++If you do want to install Git from source, you need to have the following libraries that Git depends on: autotools, curl, zlib, openssl, expat, and libiconv.
++For example, if you're on a system that has `dnf` (such as Fedora) or `apt-get` (such as a Debian-based system), you can use one of these commands to install the minimal dependencies for compiling and installing the Git binaries:
  
--[source,console]
------
--$ sudo dnf install dh-autoreconf curl-devel expat-devel gettext-devel \
--  openssl-devel perl-devel zlib-devel
--$ sudo apt-get install dh-autoreconf libcurl4-gnutls-dev libexpat1-dev \
--  gettext libz-dev libssl-dev
------
--
--In order to be able to add the documentation in various formats (doc, html, info), these additional dependencies are required:
--
--[source,console]
------
--$ sudo dnf install asciidoc xmlto docbook2X
--$ sudo apt-get install asciidoc xmlto docbook2x
------
-+In order to be able to add the documentation in various formats (doc, html, info), these additional dependencies are required (Note: users of RHEL and RHEL-derivatives like CentOS and Scientific Linux will have to https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F[enable the EPEL repository] to download the `docbook2X` package):
+-In order to be able to add the documentation in various formats (doc, html, info), these additional dependencies are required (Note: users of RHEL and RHEL-derivatives like CentOS and Scientific Linux will have to https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F[enable the EPEL repository] to download the `docbook2X` package):
++[source,console]
++----
++$ sudo dnf install dh-autoreconf curl-devel expat-devel gettext-devel \
++  openssl-devel perl-devel zlib-devel
++$ sudo apt-get install dh-autoreconf libcurl4-gnutls-dev libexpat1-dev \
++  gettext libz-dev libssl-dev
++----
++
++In order to be able to add the documentation in various formats (doc, html, info), these additional dependencies are required:
++
++[source,console]
++----
++$ sudo dnf install asciidoc xmlto docbook2X
++$ sudo apt-get install asciidoc xmlto docbook2x
++----
  
--[NOTE]
--====
--Users of RHEL and RHEL-derivatives like CentOS and Scientific Linux will have to https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F[enable the EPEL repository] to download the `docbook2X` package.
--====
--
--If you're using a Debian-based distribution (Debian/Ubuntu/Ubuntu-derivatives), you also need the `install-info` package:
--
--[source,console]
------
--$ sudo apt-get install install-info
------
--
--If you're using a RPM-based distribution (Fedora/RHEL/RHEL-derivatives), you also need the `getopt` package (which is already installed on a Debian-based distro):
--
--[source,console]
------
--$ sudo dnf install getopt
------
--
--Additionally, if you're using Fedora/RHEL/RHEL-derivatives, you need to do this:
--
--[source,console]
------
--$ sudo ln -s /usr/bin/db2x_docbook2texi /usr/bin/docbook2x-texi
------
-+Additionally, if you're using Fedora/RHEL/RHEL-derivatives, you need to do this
+-Additionally, if you're using Fedora/RHEL/RHEL-derivatives, you need to do this
++[NOTE]
++====
++Users of RHEL and RHEL-derivatives like CentOS and Scientific Linux will have to https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F[enable the EPEL repository] to download the `docbook2X` package.
++====
++
++If you're using a Debian-based distribution (Debian/Ubuntu/Ubuntu-derivatives), you also need the `install-info` package:
++
++[source,console]
++----
++$ sudo apt-get install install-info
++----
++
++If you're using a RPM-based distribution (Fedora/RHEL/RHEL-derivatives), you also need the `getopt` package (which is already installed on a Debian-based distro):
++
++[source,console]
++----
++$ sudo dnf install getopt
++----
++
++Additionally, if you're using Fedora/RHEL/RHEL-derivatives, you need to do this:
++
++[source,console]
++----
++$ sudo ln -s /usr/bin/db2x_docbook2texi /usr/bin/docbook2x-texi
++----
  
  due to binary name differences.
  
  When you have all the necessary dependencies, you can go ahead and grab the latest tagged release tarball from several places.
--You can get it via the kernel.org site, at https://www.kernel.org/pub/software/scm/git[], or the mirror on the GitHub website, at https://github.com/git/git/releases[].
-+You can get it via the Kernel.org site, at https://www.kernel.org/pub/software/scm/git[], or the mirror on the GitHub web site, at https://github.com/git/git/releases[].
+-You can get it via the Kernel.org site, at https://www.kernel.org/pub/software/scm/git[], or the mirror on the GitHub web site, at https://github.com/git/git/releases[].
++You can get it via the kernel.org site, at https://www.kernel.org/pub/software/scm/git[], or the mirror on the GitHub website, at https://github.com/git/git/releases[].
  It's generally a little clearer what the latest version is on the GitHub page, but the kernel.org page also has release signatures if you want to verify your download.
  
  Then, compile and install:
  
--[source,console]
------
--$ tar -zxf git-2.8.0.tar.gz
--$ cd git-2.8.0
--$ make configure
--$ ./configure --prefix=/usr
--$ make all doc info
--$ sudo make install install-doc install-html install-info
------
--
++[source,console]
++----
++$ tar -zxf git-2.8.0.tar.gz
++$ cd git-2.8.0
++$ make configure
++$ ./configure --prefix=/usr
++$ make all doc info
++$ sudo make install install-doc install-html install-info
++----
++
  After this is done, you can also get Git via Git itself for updates:
--
--[source,console]
------
--$ git clone git://git.kernel.org/pub/scm/git/git.git
------
++
++[source,console]
++----
++$ git clone git://git.kernel.org/pub/scm/git/git.git
++----
 Warning: file not found: ../../git/progit2/progit2-ja/book/01-introduction/sections/what-is-git.asc
-diff -au ../../git/progit2/progit2/book/02-git-basics/sections/aliases.asc /tmp/book/02-git-basics/sections/aliases.asc.tmp
---- ../../git/progit2/progit2/book/02-git-basics/sections/aliases.asc	2020-07-03 19:43:27.508489967 +0900
-+++ /tmp/book/02-git-basics/sections/aliases.asc.tmp	2020-10-25 09:24:25.617964877 +0900
-@@ -1,70 +1,28 @@
--[[_git_aliases]]
-+[[r_git_aliases]]
+diff -au /tmp/book/02-git-basics/sections/aliases.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/aliases.asc
+--- /tmp/book/02-git-basics/sections/aliases.asc.tmp	2020-10-25 11:05:02.148634054 +0900
++++ ../../git/progit2/progit2/book/02-git-basics/sections/aliases.asc	2020-07-03 19:43:27.508489967 +0900
+@@ -1,28 +1,70 @@
+-[[r_git_aliases]]
++[[_git_aliases]]
  === Git Aliases
  
--(((aliases)))
--Before we move on to the next chapter, we want to introduce a feature that can make your Git experience simpler, easier, and more familiar: aliases.
--For clarity's sake, we won't be using them anywhere else in this book, but if you go on to use Git with any regularity, aliases are something you should know about.
-+Before we finish this chapter on basic Git, there's just one little tip that can make your Git experience simpler, easier, and more familiar: aliases.
-+We won't refer to them or assume you've used them later in the book, but you should probably know how to use them.
+-Before we finish this chapter on basic Git, there's just one little tip that can make your Git experience simpler, easier, and more familiar: aliases.
+-We won't refer to them or assume you've used them later in the book, but you should probably know how to use them.
++(((aliases)))
++Before we move on to the next chapter, we want to introduce a feature that can make your Git experience simpler, easier, and more familiar: aliases.
++For clarity's sake, we won't be using them anywhere else in this book, but if you go on to use Git with any regularity, aliases are something you should know about.
  
  Git doesn't automatically infer your command if you type it in partially.
  If you don't want to type the entire text of each of the Git commands, you can easily set up an alias for each command using `git config`.(((git commands, config)))
  Here are a couple of examples you may want to set up:
  
--[source,console]
------
--$ git config --global alias.co checkout
--$ git config --global alias.br branch
--$ git config --global alias.ci commit
--$ git config --global alias.st status
------
--
++[source,console]
++----
++$ git config --global alias.co checkout
++$ git config --global alias.br branch
++$ git config --global alias.ci commit
++$ git config --global alias.st status
++----
++
  This means that, for example, instead of typing `git commit`, you just need to type `git ci`.
  As you go on using Git, you'll probably use other commands frequently as well; don't hesitate to create new aliases.
  
  This technique can also be very useful in creating commands that you think should exist.
  For example, to correct the usability problem you encountered with unstaging a file, you can add your own unstage alias to Git:
  
--[source,console]
------
--$ git config --global alias.unstage 'reset HEAD --'
------
--
++[source,console]
++----
++$ git config --global alias.unstage 'reset HEAD --'
++----
++
  This makes the following two commands equivalent:
  
--[source,console]
------
--$ git unstage fileA
--$ git reset HEAD -- fileA
------
--
++[source,console]
++----
++$ git unstage fileA
++$ git reset HEAD -- fileA
++----
++
  This seems a bit clearer.
  It's also common to add a `last` command, like this:
  
--[source,console]
------
--$ git config --global alias.last 'log -1 HEAD'
------
--
++[source,console]
++----
++$ git config --global alias.last 'log -1 HEAD'
++----
++
  This way, you can see the last commit easily:
  
--[source,console]
------
--$ git last
--commit 66938dae3329c7aebe598c2246a8e6af90d04646
--Author: Josh Goebel <[e-mail]>
--Date:   Tue Aug 26 19:48:51 2008 +0800
--
--    Test for current head
--
--    Signed-off-by: Scott Chacon <[e-mail]>
------
--
++[source,console]
++----
++$ git last
++commit 66938dae3329c7aebe598c2246a8e6af90d04646
++Author: Josh Goebel <[e-mail]>
++Date:   Tue Aug 26 19:48:51 2008 +0800
++
++    Test for current head
++
++    Signed-off-by: Scott Chacon <[e-mail]>
++----
++
  As you can tell, Git simply replaces the new command with whatever you alias it for.
  However, maybe you want to run an external command, rather than a Git subcommand.
  In that case, you start the command with a `!` character.
  This is useful if you write your own tools that work with a Git repository.
  We can demonstrate by aliasing `git visual` to run `gitk`:
--
--[source,console]
------
--$ git config --global alias.visual '!gitk'
------
-diff -au ../../git/progit2/progit2/book/02-git-basics/sections/getting-a-repository.asc /tmp/book/02-git-basics/sections/getting-a-repository.asc.tmp
---- ../../git/progit2/progit2/book/02-git-basics/sections/getting-a-repository.asc	2020-07-01 10:48:37.610009640 +0900
-+++ /tmp/book/02-git-basics/sections/getting-a-repository.asc.tmp	2020-10-25 09:24:25.621965066 +0900
-@@ -1,87 +1,41 @@
--[[_getting_a_repo]]
-+[[r_getting_a_repo]]
++
++[source,console]
++----
++$ git config --global alias.visual '!gitk'
++----
+diff -au /tmp/book/02-git-basics/sections/getting-a-repository.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/getting-a-repository.asc
+--- /tmp/book/02-git-basics/sections/getting-a-repository.asc.tmp	2020-10-25 11:05:02.153634335 +0900
++++ ../../git/progit2/progit2/book/02-git-basics/sections/getting-a-repository.asc	2020-07-01 10:48:37.610009640 +0900
+@@ -1,41 +1,87 @@
+-[[r_getting_a_repo]]
++[[_getting_a_repo]]
  === Getting a Git Repository
  
--You typically obtain a Git repository in one of two ways:
--
--1. You can take a local directory that is currently not under version control, and turn it into a Git repository, or
--2. You can _clone_ an existing Git repository from elsewhere.
--
--In either case, you end up with a Git repository on your local machine, ready for work.
-+You can get a Git project using two main approaches.
-+The first takes an existing project or directory and imports it into Git.
-+The second clones an existing Git repository from another server.
+-You can get a Git project using two main approaches.
+-The first takes an existing project or directory and imports it into Git.
+-The second clones an existing Git repository from another server.
++You typically obtain a Git repository in one of two ways:
++
++1. You can take a local directory that is currently not under version control, and turn it into a Git repository, or
++2. You can _clone_ an existing Git repository from elsewhere.
++
++In either case, you end up with a Git repository on your local machine, ready for work.
  
  ==== Initializing a Repository in an Existing Directory
  
--If you have a project directory that is currently not under version control and you want to start controlling it with Git, you first need to go to that project's directory.
--If you've never done this, it looks a little different depending on which system you're running:
-+If you're starting to track an existing project in Git, you need to go to the project's directory and type:
+-If you're starting to track an existing project in Git, you need to go to the project's directory and type:
++If you have a project directory that is currently not under version control and you want to start controlling it with Git, you first need to go to that project's directory.
++If you've never done this, it looks a little different depending on which system you're running:
  
--for Linux:
--[source,console]
------
--$ cd /home/user/my_project
------
--for macOS:
--[source,console]
------
--$ cd /Users/user/my_project
------
--for Windows:
--[source,console]
------
--$ cd C:/Users/user/my_project
------
--
--and type:
--
--[source,console]
------
--$ git init
------
--
--This creates a new subdirectory named `.git` that contains all of your necessary repository files -- a Git repository skeleton.
-+This creates a new subdirectory named `.git` that contains all of your necessary repository files – a Git repository skeleton.
+-This creates a new subdirectory named `.git` that contains all of your necessary repository files – a Git repository skeleton.
++for Linux:
++[source,console]
++----
++$ cd /home/user/my_project
++----
++for macOS:
++[source,console]
++----
++$ cd /Users/user/my_project
++----
++for Windows:
++[source,console]
++----
++$ cd C:/Users/user/my_project
++----
++
++and type:
++
++[source,console]
++----
++$ git init
++----
++
++This creates a new subdirectory named `.git` that contains all of your necessary repository files -- a Git repository skeleton.
  At this point, nothing in your project is tracked yet.
--See <<ch10-git-internals#ch10-git-internals>> for more information about exactly what files are contained in the `.git` directory you just created.(((git commands, init)))
-+(See <<ch10-git-internals#ch10-git-internals>> for more information about exactly what files are contained in the `.git` directory you just created.)(((git commands, init)))
+-(See <<ch10-git-internals#ch10-git-internals>> for more information about exactly what files are contained in the `.git` directory you just created.)(((git commands, init)))
++See <<ch10-git-internals#ch10-git-internals>> for more information about exactly what files are contained in the `.git` directory you just created.(((git commands, init)))
  
  If you want to start version-controlling existing files (as opposed to an empty directory), you should probably begin tracking those files and do an initial commit.
  You can accomplish that with a few `git add` commands that specify the files you want to track, followed by a `git commit`:
  
--[source,console]
------
--$ git add *.c
--$ git add LICENSE
--$ git commit -m 'Initial project version'
------
--
++[source,console]
++----
++$ git add *.c
++$ git add LICENSE
++$ git commit -m 'Initial project version'
++----
++
  We'll go over what these commands do in just a minute.
  At this point, you have a Git repository with tracked files and an initial commit.
  
--[[_git_cloning]]
++[[_git_cloning]]
  ==== Cloning an Existing Repository
  
--If you want to get a copy of an existing Git repository -- for example, a project you'd like to contribute to -- the command you need is `git clone`.
-+If you want to get a copy of an existing Git repository – for example, a project you'd like to contribute to – the command you need is `git clone`.
+-If you want to get a copy of an existing Git repository – for example, a project you'd like to contribute to – the command you need is `git clone`.
++If you want to get a copy of an existing Git repository -- for example, a project you'd like to contribute to -- the command you need is `git clone`.
  If you're familiar with other VCS systems such as Subversion, you'll notice that the command is "clone" and not "checkout".
--This is an important distinction -- instead of getting just a working copy, Git receives a full copy of nearly all data that the server has.
-+This is an important distinction – instead of getting just a working copy, Git receives a full copy of nearly all data that the server has.
+-This is an important distinction – instead of getting just a working copy, Git receives a full copy of nearly all data that the server has.
++This is an important distinction -- instead of getting just a working copy, Git receives a full copy of nearly all data that the server has.
  Every version of every file for the history of the project is pulled down by default when you run `git clone`.
--In fact, if your server disk gets corrupted, you can often use nearly any of the clones on any client to set the server back to the state it was in when it was cloned (you may lose some server-side hooks and such, but all the versioned data would be there -- see <<ch04-git-on-the-server#_getting_git_on_a_server>> for more details).
--
--You clone a repository with `git clone <url>`.(((git commands, clone)))
--For example, if you want to clone the Git linkable library called `libgit2`, you can do so like this:
--
--[source,console]
------
--$ git clone https://github.com/libgit2/libgit2
------
--
--That creates a directory named `libgit2`, initializes a `.git` directory inside it, pulls down all the data for that repository, and checks out a working copy of the latest version.
--If you go into the new `libgit2` directory that was just created, you'll see the project files in there, ready to be worked on or used.
-+In fact, if your server disk gets corrupted, you can often use nearly any of the clones on any client to set the server back to the state it was in when it was cloned (you may lose some server-side hooks and such, but all the versioned data would be there – see <<ch04-git-server#r_git_on_the_server>> for more details).
+-In fact, if your server disk gets corrupted, you can often use nearly any of the clones on any client to set the server back to the state it was in when it was cloned (you may lose some server-side hooks and such, but all the versioned data would be there – see <<ch04-git-server#r_git_on_the_server>> for more details).
++In fact, if your server disk gets corrupted, you can often use nearly any of the clones on any client to set the server back to the state it was in when it was cloned (you may lose some server-side hooks and such, but all the versioned data would be there -- see <<ch04-git-on-the-server#_getting_git_on_a_server>> for more details).
++
++You clone a repository with `git clone <url>`.(((git commands, clone)))
++For example, if you want to clone the Git linkable library called `libgit2`, you can do so like this:
++
++[source,console]
++----
++$ git clone https://github.com/libgit2/libgit2
++----
++
++That creates a directory named `libgit2`, initializes a `.git` directory inside it, pulls down all the data for that repository, and checks out a working copy of the latest version.
++If you go into the new `libgit2` directory that was just created, you'll see the project files in there, ready to be worked on or used.
  
--If you want to clone the repository into a directory named something other than `libgit2`, you can specify the new directory name as an additional argument:
-+You clone a repository with `git clone [url]`.(((git commands, clone)))
-+For example, if you want to clone the Git linkable library called libgit2, you can do so like this:
+-You clone a repository with `git clone [url]`.(((git commands, clone)))
+-For example, if you want to clone the Git linkable library called libgit2, you can do so like this:
++If you want to clone the repository into a directory named something other than `libgit2`, you can specify the new directory name as an additional argument:
  
--[source,console]
------
--$ git clone https://github.com/libgit2/libgit2 mylibgit
------
-+That creates a directory named ``libgit2'', initializes a `.git` directory inside it, pulls down all the data for that repository, and checks out a working copy of the latest version.
-+If you go into the new `libgit2` directory, you'll see the project files in there, ready to be worked on or used.
-+If you want to clone the repository into a directory named something other than ``libgit2'', you can specify that as the next command-line option:
+-That creates a directory named ``libgit2'', initializes a `.git` directory inside it, pulls down all the data for that repository, and checks out a working copy of the latest version.
+-If you go into the new `libgit2` directory, you'll see the project files in there, ready to be worked on or used.
+-If you want to clone the repository into a directory named something other than ``libgit2'', you can specify that as the next command-line option:
++[source,console]
++----
++$ git clone https://github.com/libgit2/libgit2 mylibgit
++----
  
  That command does the same thing as the previous one, but the target directory is called `mylibgit`.
  
  Git has a number of different transfer protocols you can use.
  The previous example uses the `https://` protocol, but you may also see `git://` or `user@server:path/to/repo.git`, which uses the SSH transfer protocol.
--<<ch04-git-on-the-server#_getting_git_on_a_server>> will introduce all of the available options the server can set up to access your Git repository and the pros and cons of each.
-+<<ch04-git-server#r_git_on_the_server>> will introduce all of the available options the server can set up to access your Git repository and the pros and cons of each.
-diff -au ../../git/progit2/progit2/book/02-git-basics/sections/recording-changes.asc /tmp/book/02-git-basics/sections/recording-changes.asc.tmp
---- ../../git/progit2/progit2/book/02-git-basics/sections/recording-changes.asc	2020-07-04 16:36:46.720685416 +0900
-+++ /tmp/book/02-git-basics/sections/recording-changes.asc.tmp	2020-10-25 09:24:25.627965349 +0900
-@@ -1,91 +1,48 @@
+-<<ch04-git-server#r_git_on_the_server>> will introduce all of the available options the server can set up to access your Git repository and the pros and cons of each.
++<<ch04-git-on-the-server#_getting_git_on_a_server>> will introduce all of the available options the server can set up to access your Git repository and the pros and cons of each.
+diff -au /tmp/book/02-git-basics/sections/recording-changes.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/recording-changes.asc
+--- /tmp/book/02-git-basics/sections/recording-changes.asc.tmp	2020-10-25 11:05:02.160634728 +0900
++++ ../../git/progit2/progit2/book/02-git-basics/sections/recording-changes.asc	2020-07-04 16:36:46.720685416 +0900
+@@ -1,48 +1,91 @@
  === Recording Changes to the Repository
  
--At this point, you should have a _bona fide_ Git repository on your local machine, and a checkout or _working copy_ of all of its files in front of you.
--Typically, you'll want to start making changes and committing snapshots of those changes into your repository each time the project reaches a state you want to record.
-+You have a bona fide Git repository and a checkout or working copy of the files for that project.
-+You need to make some changes and commit snapshots of those changes into your repository each time the project reaches a state you want to record.
+-You have a bona fide Git repository and a checkout or working copy of the files for that project.
+-You need to make some changes and commit snapshots of those changes into your repository each time the project reaches a state you want to record.
++At this point, you should have a _bona fide_ Git repository on your local machine, and a checkout or _working copy_ of all of its files in front of you.
++Typically, you'll want to start making changes and committing snapshots of those changes into your repository each time the project reaches a state you want to record.
  
--Remember that each file in your working directory can be in one of two states: _tracked_ or _untracked_.
-+Remember that each file in your working directory can be in one of two states: tracked or untracked.
+-Remember that each file in your working directory can be in one of two states: tracked or untracked.
++Remember that each file in your working directory can be in one of two states: _tracked_ or _untracked_.
  Tracked files are files that were in the last snapshot; they can be unmodified, modified, or staged.
--In short, tracked files are files that Git knows about.
--
--Untracked files are everything else -- any files in your working directory that were not in your last snapshot and are not in your staging area.
--When you first clone a repository, all of your files will be tracked and unmodified because Git just checked them out and you haven't edited anything.
-+Untracked files are everything else – any files in your working directory that were not in your last snapshot and are not in your staging area.
-+When you first clone a repository, all of your files will be tracked and unmodified because you just checked them out and haven't edited anything.
+-Untracked files are everything else – any files in your working directory that were not in your last snapshot and are not in your staging area.
+-When you first clone a repository, all of your files will be tracked and unmodified because you just checked them out and haven't edited anything.
++In short, tracked files are files that Git knows about.
++
++Untracked files are everything else -- any files in your working directory that were not in your last snapshot and are not in your staging area.
++When you first clone a repository, all of your files will be tracked and unmodified because Git just checked them out and you haven't edited anything.
  
  As you edit files, Git sees them as modified, because you've changed them since your last commit.
--As you work, you selectively stage these modified files and then commit all those staged changes, and the cycle repeats.
-+You stage these modified files and then commit all your staged changes, and the cycle repeats.
+-You stage these modified files and then commit all your staged changes, and the cycle repeats.
++As you work, you selectively stage these modified files and then commit all those staged changes, and the cycle repeats.
  
--.The lifecycle of the status of your files
--image::images/lifecycle.png[The lifecycle of the status of your files]
-+.The lifecycle of the status of your files.
-+image::images/lifecycle.png[The lifecycle of the status of your files.]
+-.The lifecycle of the status of your files.
+-image::images/lifecycle.png[The lifecycle of the status of your files.]
++.The lifecycle of the status of your files
++image::images/lifecycle.png[The lifecycle of the status of your files]
  
--[[_checking_status]]
++[[_checking_status]]
  ==== Checking the Status of Your Files
  
  The main tool you use to determine which files are in which state is the `git status` command.(((git commands, status)))
  If you run this command directly after a clone, you should see something like this:
  
--[source,console]
------
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--nothing to commit, working directory clean
------
--
--This means you have a clean working directory; in other words, none of your tracked files are modified.
-+This means you have a clean working directory – in other words, there are no tracked and modified files.
+-This means you have a clean working directory – in other words, there are no tracked and modified files.
++[source,console]
++----
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++nothing to commit, working directory clean
++----
++
++This means you have a clean working directory; in other words, none of your tracked files are modified.
  Git also doesn't see any untracked files, or they would be listed here.
  Finally, the command tells you which branch you're on and informs you that it has not diverged from the same branch on the server.
--For now, that branch is always `master`, which is the default; you won't worry about it here.
--<<ch03-git-branching#ch03-git-branching>> will go over branches and references in detail.
-+For now, that branch is always ``master'', which is the default; you won't worry about it here.
-+<<ch03-git-branching#ch03-git-branching>>  will go over branches and references in detail.
+-For now, that branch is always ``master'', which is the default; you won't worry about it here.
+-<<ch03-git-branching#ch03-git-branching>>  will go over branches and references in detail.
++For now, that branch is always `master`, which is the default; you won't worry about it here.
++<<ch03-git-branching#ch03-git-branching>> will go over branches and references in detail.
  
--Let's say you add a new file to your project, a simple `README` file.
-+Let's say you add a new file to your project, a simple README file.
+-Let's say you add a new file to your project, a simple README file.
++Let's say you add a new file to your project, a simple `README` file.
  If the file didn't exist before, and you run `git status`, you see your untracked file like so:
  
--[source,console]
------
--$ echo 'My Project' > README
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Untracked files:
--  (use "git add <file>..." to include in what will be committed)
--
--    README
--
--nothing added to commit but untracked files present (use "git add" to track)
------
--
--You can see that your new `README` file is untracked, because it's under the ``Untracked files'' heading in your status output.
-+You can see that your new README file is untracked, because it's under the ``Untracked files'' heading in your status output.
+-You can see that your new README file is untracked, because it's under the ``Untracked files'' heading in your status output.
++[source,console]
++----
++$ echo 'My Project' > README
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Untracked files:
++  (use "git add <file>..." to include in what will be committed)
++
++    README
++
++nothing added to commit but untracked files present (use "git add" to track)
++----
++
++You can see that your new `README` file is untracked, because it's under the ``Untracked files'' heading in your status output.
  Untracked basically means that Git sees a file you didn't have in the previous snapshot (commit); Git won't start including it in your commit snapshots until you explicitly tell it to do so.
  It does this so you don't accidentally begin including generated binary files or other files that you did not mean to include.
--You do want to start including `README`, so let's start tracking the file.
-+You do want to start including README, so let's start tracking the file.
+-You do want to start including README, so let's start tracking the file.
++You do want to start including `README`, so let's start tracking the file.
  
--[[_tracking_files]]
++[[_tracking_files]]
  ==== Tracking New Files
  
  In order to begin tracking a new file, you use the command `git add`.(((git commands, add)))
--To begin tracking the `README` file, you can run this:
--
--[source,console]
------
--$ git add README
------
--
--If you run your status command again, you can see that your `README` file is now tracked and staged to be committed:
--
--[source,console]
------
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Changes to be committed:
--  (use "git restore --staged <file>..." to unstage)
-+To begin tracking the README file, you can run this:
- 
--    new file:   README
--
------
-+If you run your status command again, you can see that your README file is now tracked and staged to be committed:
+-To begin tracking the README file, you can run this:
++To begin tracking the `README` file, you can run this:
++
++[source,console]
++----
++$ git add README
++----
++
++If you run your status command again, you can see that your `README` file is now tracked and staged to be committed:
++
++[source,console]
++----
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Changes to be committed:
++  (use "git restore --staged <file>..." to unstage)
+ 
+-If you run your status command again, you can see that your README file is now tracked and staged to be committed:
++    new file:   README
++
++----
  
  You can tell that it's staged because it's under the ``Changes to be committed'' heading.
--If you commit at this point, the version of the file at the time you ran `git add` is what will be in the subsequent historical snapshot.
--You may recall that when you ran `git init` earlier, you then ran `git add <files>` -- that was to begin tracking files in your directory.(((git commands, init)))(((git commands, add)))
-+If you commit at this point, the version of the file at the time you ran `git add` is what will be in the historical snapshot.
-+You may recall that when you ran `git init` earlier, you then ran `git add (files)` – that was to begin tracking files in your directory.(((git commands, init)))(((git commands, add)))
+-If you commit at this point, the version of the file at the time you ran `git add` is what will be in the historical snapshot.
+-You may recall that when you ran `git init` earlier, you then ran `git add (files)` – that was to begin tracking files in your directory.(((git commands, init)))(((git commands, add)))
++If you commit at this point, the version of the file at the time you ran `git add` is what will be in the subsequent historical snapshot.
++You may recall that when you ran `git init` earlier, you then ran `git add <files>` -- that was to begin tracking files in your directory.(((git commands, init)))(((git commands, add)))
  The `git add` command takes a path name for either a file or a directory; if it's a directory, the command adds all the files in that directory recursively.
  
  ==== Staging Modified Files
-@@ -93,69 +50,17 @@
+@@ -50,17 +93,69 @@
  Let's change a file that was already tracked.
  If you change a previously tracked file called `CONTRIBUTING.md` and then run your `git status` command again, you get something that looks like this:
  
--[source,console]
------
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Changes to be committed:
--  (use "git reset HEAD <file>..." to unstage)
--
--    new file:   README
--
--Changes not staged for commit:
--  (use "git add <file>..." to update what will be committed)
--  (use "git checkout -- <file>..." to discard changes in working directory)
--
--    modified:   CONTRIBUTING.md
--
------
--
--The `CONTRIBUTING.md` file appears under a section named ``Changes not staged for commit'' -- which means that a file that is tracked has been modified in the working directory but not yet staged.
-+The `CONTRIBUTING.md` file appears under a section named ``Changes not staged for commit'' – which means that a file that is tracked has been modified in the working directory but not yet staged.
+-The `CONTRIBUTING.md` file appears under a section named ``Changes not staged for commit'' – which means that a file that is tracked has been modified in the working directory but not yet staged.
++[source,console]
++----
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Changes to be committed:
++  (use "git reset HEAD <file>..." to unstage)
++
++    new file:   README
++
++Changes not staged for commit:
++  (use "git add <file>..." to update what will be committed)
++  (use "git checkout -- <file>..." to discard changes in working directory)
++
++    modified:   CONTRIBUTING.md
++
++----
++
++The `CONTRIBUTING.md` file appears under a section named ``Changes not staged for commit'' -- which means that a file that is tracked has been modified in the working directory but not yet staged.
  To stage it, you run the `git add` command.
--`git add` is a multipurpose command -- you use it to begin tracking new files, to stage files, and to do other things like marking merge-conflicted files as resolved.
--It may be helpful to think of it more as ``add precisely this content to the next commit'' rather than ``add this file to the project''.(((git commands, add)))
-+`git add` is a multipurpose command – you use it to begin tracking new files, to stage files, and to do other things like marking merge-conflicted files as resolved.
-+It may be helpful to think of it more as ``add this content to the next commit'' rather than ``add this file to the project''.(((git commands, add)))
+-`git add` is a multipurpose command – you use it to begin tracking new files, to stage files, and to do other things like marking merge-conflicted files as resolved.
+-It may be helpful to think of it more as ``add this content to the next commit'' rather than ``add this file to the project''.(((git commands, add)))
++`git add` is a multipurpose command -- you use it to begin tracking new files, to stage files, and to do other things like marking merge-conflicted files as resolved.
++It may be helpful to think of it more as ``add precisely this content to the next commit'' rather than ``add this file to the project''.(((git commands, add)))
  Let's run `git add` now to stage the `CONTRIBUTING.md` file, and then run `git status` again:
  
--[source,console]
------
--$ git add CONTRIBUTING.md
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Changes to be committed:
--  (use "git reset HEAD <file>..." to unstage)
--
--    new file:   README
--    modified:   CONTRIBUTING.md
--
------
--
++[source,console]
++----
++$ git add CONTRIBUTING.md
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Changes to be committed:
++  (use "git reset HEAD <file>..." to unstage)
++
++    new file:   README
++    modified:   CONTRIBUTING.md
++
++----
++
  Both files are staged and will go into your next commit.
  At this point, suppose you remember one little change that you want to make in `CONTRIBUTING.md` before you commit it.
  You open it again and make that change, and you're ready to commit.
  However, let's run `git status` one more time:
  
--[source,console]
------
--$ vim CONTRIBUTING.md
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Changes to be committed:
--  (use "git reset HEAD <file>..." to unstage)
--
--    new file:   README
--    modified:   CONTRIBUTING.md
--
--Changes not staged for commit:
--  (use "git add <file>..." to update what will be committed)
--  (use "git checkout -- <file>..." to discard changes in working directory)
--
--    modified:   CONTRIBUTING.md
--
------
--
++[source,console]
++----
++$ vim CONTRIBUTING.md
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Changes to be committed:
++  (use "git reset HEAD <file>..." to unstage)
++
++    new file:   README
++    modified:   CONTRIBUTING.md
++
++Changes not staged for commit:
++  (use "git add <file>..." to update what will be committed)
++  (use "git checkout -- <file>..." to discard changes in working directory)
++
++    modified:   CONTRIBUTING.md
++
++----
++
  What the heck?
  Now `CONTRIBUTING.md` is listed as both staged _and_ unstaged.
  How is that possible?
-@@ -163,41 +68,17 @@
+@@ -68,17 +163,41 @@
  If you commit now, the version of `CONTRIBUTING.md` as it was when you last ran the `git add` command is how it will go into the commit, not the version of the file as it looks in your working directory when you run `git commit`.
  If you modify a file after you run `git add`, you have to run `git add` again to stage the latest version of the file:
  
--[source,console]
------
--$ git add CONTRIBUTING.md
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Changes to be committed:
--  (use "git reset HEAD <file>..." to unstage)
--
--    new file:   README
--    modified:   CONTRIBUTING.md
------
--
++[source,console]
++----
++$ git add CONTRIBUTING.md
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Changes to be committed:
++  (use "git reset HEAD <file>..." to unstage)
++
++    new file:   README
++    modified:   CONTRIBUTING.md
++----
++
  ==== Short Status
  
  While the `git status` output is pretty comprehensive, it's also quite wordy.
  Git also has a short status flag so you can see your changes in a more compact way.
  If you run `git status -s` or `git status --short` you get a far more simplified output from the command:
  
--[source,console]
------
--$ git status -s
-- M README
--MM Rakefile
--A  lib/git.rb
--M  lib/simplegit.rb
--?? LICENSE.txt
------
--
++[source,console]
++----
++$ git status -s
++ M README
++MM Rakefile
++A  lib/git.rb
++M  lib/simplegit.rb
++?? LICENSE.txt
++----
++
  New files that aren't tracked have a `??` next to them, new files that have been added to the staging area have an `A`, modified files have an `M` and so on.
--There are two columns to the output -- the left-hand column indicates the status of the staging area and the right-hand column indicates the status of the working tree.
-+There are two columns to the output - the left hand column indicates that the file is staged and the right hand column indicates that it's modified.
+-There are two columns to the output - the left hand column indicates that the file is staged and the right hand column indicates that it's modified.
++There are two columns to the output -- the left-hand column indicates the status of the staging area and the right-hand column indicates the status of the working tree.
  So for example in that output, the `README` file is modified in the working directory but not yet staged, while the `lib/simplegit.rb` file is modified and staged.
  The `Rakefile` was modified, staged and then modified again, so there are changes to it that are both staged and unstaged.
  
--[[_ignoring]]
++[[_ignoring]]
  ==== Ignoring Files
  
  Often, you'll have a class of files that you don't want Git to automatically add or even show you as being untracked.
-@@ -205,198 +86,57 @@
+@@ -86,57 +205,198 @@
  In such cases, you can create a file listing patterns to match them named `.gitignore`.(((ignoring files)))
  Here is an example `.gitignore` file:
  
--[source,console]
------
--$ cat .gitignore
--*.[oa]
--*~
------
--
--The first line tells Git to ignore any files ending in ``.o'' or ``.a'' -- object and archive files that may be the product of building your code.
--The second line tells Git to ignore all files whose names end with a tilde (`~`), which is used by many text editors such as Emacs to mark temporary files.
-+The first line tells Git to ignore any files ending in ``.o'' or ``.a'' – object and archive files that may be the product of building your code.
-+The second line tells Git to ignore all files that end with a tilde (`~`), which is used by many text editors such as Emacs to mark temporary files.
+-The first line tells Git to ignore any files ending in ``.o'' or ``.a'' – object and archive files that may be the product of building your code.
+-The second line tells Git to ignore all files that end with a tilde (`~`), which is used by many text editors such as Emacs to mark temporary files.
++[source,console]
++----
++$ cat .gitignore
++*.[oa]
++*~
++----
++
++The first line tells Git to ignore any files ending in ``.o'' or ``.a'' -- object and archive files that may be the product of building your code.
++The second line tells Git to ignore all files whose names end with a tilde (`~`), which is used by many text editors such as Emacs to mark temporary files.
  You may also include a log, tmp, or pid directory; automatically generated documentation; and so on.
--Setting up a `.gitignore` file for your new repository before you get going is generally a good idea so you don't accidentally commit files that you really don't want in your Git repository.
-+Setting up a `.gitignore` file before you get going is generally a good idea so you don't accidentally commit files that you really don't want in your Git repository.
+-Setting up a `.gitignore` file before you get going is generally a good idea so you don't accidentally commit files that you really don't want in your Git repository.
++Setting up a `.gitignore` file for your new repository before you get going is generally a good idea so you don't accidentally commit files that you really don't want in your Git repository.
  
  The rules for the patterns you can put in the `.gitignore` file are as follows:
  
  *  Blank lines or lines starting with `#` are ignored.
--*  Standard glob patterns work, and will be applied recursively throughout the entire working tree.
-+*  Standard glob patterns work.
+-*  Standard glob patterns work.
++*  Standard glob patterns work, and will be applied recursively throughout the entire working tree.
  *  You can start patterns with a forward slash (`/`) to avoid recursivity.
  *  You can end patterns with a forward slash (`/`) to specify a directory.
  *  You can negate a pattern by starting it with an exclamation point (`!`).
  
  Glob patterns are like simplified regular expressions that shells use.
--An asterisk (`*`) matches zero or more characters; `[abc]` matches any character inside the brackets (in this case a, b, or c); a question mark (`?`) matches a single character; and brackets enclosing characters separated by a hyphen (`[0-9]`) matches any character between them (in this case 0 through 9).
-+An asterisk (`*`) matches zero or more characters; `[abc]` matches any character inside the brackets (in this case a, b, or c); a question mark (`?`) matches a single character; and brackets enclosing characters separated by a hyphen(`[0-9]`) matches any character between them (in this case 0 through 9).
+-An asterisk (`*`) matches zero or more characters; `[abc]` matches any character inside the brackets (in this case a, b, or c); a question mark (`?`) matches a single character; and brackets enclosing characters separated by a hyphen(`[0-9]`) matches any character between them (in this case 0 through 9).
++An asterisk (`*`) matches zero or more characters; `[abc]` matches any character inside the brackets (in this case a, b, or c); a question mark (`?`) matches a single character; and brackets enclosing characters separated by a hyphen (`[0-9]`) matches any character between them (in this case 0 through 9).
  You can also use two asterisks to match nested directories; `a/**/z` would match `a/z`, `a/b/z`, `a/b/c/z`, and so on.
  
--Here is another example `.gitignore` file:
--
--[source]
------
--# ignore all .a files
--*.a
--
--# but do track lib.a, even though you're ignoring .a files above
--!lib.a
--
--# only ignore the TODO file in the current directory, not subdir/TODO
--/TODO
-+Here is another example .gitignore file:
+-Here is another example .gitignore file:
++Here is another example `.gitignore` file:
++
++[source]
++----
++# ignore all .a files
++*.a
++
++# but do track lib.a, even though you're ignoring .a files above
++!lib.a
++
++# only ignore the TODO file in the current directory, not subdir/TODO
++/TODO
  
--# ignore all files in any directory named build
--build/
--
--# ignore doc/notes.txt, but not doc/server/arch.txt
--doc/*.txt
--
--# ignore all .pdf files in the doc/ directory and any of its subdirectories
--doc/**/*.pdf
------
--
--[TIP]
++# ignore all files in any directory named build
++build/
++
++# ignore doc/notes.txt, but not doc/server/arch.txt
++doc/*.txt
++
++# ignore all .pdf files in the doc/ directory and any of its subdirectories
++doc/**/*.pdf
++----
++
++[TIP]
  ====
  GitHub maintains a fairly comprehensive list of good `.gitignore` file examples for dozens of projects and languages at https://github.com/github/gitignore[] if you want a starting point for your project.
  ====
  
--[NOTE]
--====
--In the simple case, a repository might have a single `.gitignore` file in its root directory, which applies recursively to the entire repository.
--However, it is also possible to have additional `.gitignore` files in subdirectories.
--The rules in these nested `.gitignore` files apply only to the files under the directory where they are located.
--The Linux kernel source repository has 206 `.gitignore` files.
--
--It is beyond the scope of this book to get into the details of multiple `.gitignore` files; see `man gitignore` for the details.
--====
--
--[[_git_diff_staged]]
++[NOTE]
++====
++In the simple case, a repository might have a single `.gitignore` file in its root directory, which applies recursively to the entire repository.
++However, it is also possible to have additional `.gitignore` files in subdirectories.
++The rules in these nested `.gitignore` files apply only to the files under the directory where they are located.
++The Linux kernel source repository has 206 `.gitignore` files.
++
++It is beyond the scope of this book to get into the details of multiple `.gitignore` files; see `man gitignore` for the details.
++====
++
++[[_git_diff_staged]]
  ==== Viewing Your Staged and Unstaged Changes
  
--If the `git status` command is too vague for you -- you want to know exactly what you changed, not just which files were changed -- you can use the `git diff` command.(((git commands, diff)))
-+If the `git status` command is too vague for you – you want to know exactly what you changed, not just which files were changed – you can use the `git diff` command.(((git commands, diff)))
+-If the `git status` command is too vague for you – you want to know exactly what you changed, not just which files were changed – you can use the `git diff` command.(((git commands, diff)))
++If the `git status` command is too vague for you -- you want to know exactly what you changed, not just which files were changed -- you can use the `git diff` command.(((git commands, diff)))
  We'll cover `git diff` in more detail later, but you'll probably use it most often to answer these two questions: What have you changed but not yet staged?
  And what have you staged that you are about to commit?
--Although `git status` answers those questions very generally by listing the file names, `git diff` shows you the exact lines added and removed -- the patch, as it were.
-+Although `git status` answers those questions very generally by listing the file names, `git diff` shows you the exact lines added and removed – the patch, as it were.
+-Although `git status` answers those questions very generally by listing the file names, `git diff` shows you the exact lines added and removed – the patch, as it were.
++Although `git status` answers those questions very generally by listing the file names, `git diff` shows you the exact lines added and removed -- the patch, as it were.
  
  Let's say you edit and stage the `README` file again and then edit the `CONTRIBUTING.md` file without staging it.
  If you run your `git status` command, you once again see something like this:
  
--[source,console]
------
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Changes to be committed:
--  (use "git reset HEAD <file>..." to unstage)
--
--    modified:   README
--
--Changes not staged for commit:
--  (use "git add <file>..." to update what will be committed)
--  (use "git checkout -- <file>..." to discard changes in working directory)
--
--    modified:   CONTRIBUTING.md
------
--
++[source,console]
++----
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Changes to be committed:
++  (use "git reset HEAD <file>..." to unstage)
++
++    modified:   README
++
++Changes not staged for commit:
++  (use "git add <file>..." to update what will be committed)
++  (use "git checkout -- <file>..." to discard changes in working directory)
++
++    modified:   CONTRIBUTING.md
++----
++
  To see what you've changed but not yet staged, type `git diff` with no other arguments:
  
--[source,console]
------
--$ git diff
--diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
--index 8ebb991..643e24f 100644
----- a/CONTRIBUTING.md
--+++ b/CONTRIBUTING.md
--@@ -65,7 +65,8 @@ branch directly, things can get messy.
-- Please include a nice description of your changes when you submit your PR;
-- if we have to read the whole diff to figure out why you're contributing
-- in the first place, you're less likely to get feedback and have your change
---merged in.
--+merged in. Also, split your changes into comprehensive chunks if your patch is
--+longer than a dozen lines.
--
-- If you are starting to work on a particular area, feel free to submit a PR
-- that highlights your work in progress (and note in the PR title that it's
------
--
++[source,console]
++----
++$ git diff
++diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
++index 8ebb991..643e24f 100644
++--- a/CONTRIBUTING.md
+++++ b/CONTRIBUTING.md
++@@ -65,7 +65,8 @@ branch directly, things can get messy.
++ Please include a nice description of your changes when you submit your PR;
++ if we have to read the whole diff to figure out why you're contributing
++ in the first place, you're less likely to get feedback and have your change
++-merged in.
+++merged in. Also, split your changes into comprehensive chunks if your patch is
+++longer than a dozen lines.
++
++ If you are starting to work on a particular area, feel free to submit a PR
++ that highlights your work in progress (and note in the PR title that it's
++----
++
  That command compares what is in your working directory with what is in your staging area.
  The result tells you the changes you've made that you haven't yet staged.
  
  If you want to see what you've staged that will go into your next commit, you can use `git diff --staged`.
  This command compares your staged changes to your last commit:
  
--[source,console]
------
--$ git diff --staged
--diff --git a/README b/README
--new file mode 100644
--index 0000000..03902a1
----- /dev/null
--+++ b/README
--@@ -0,0 +1 @@
--+My Project
------
--
--It's important to note that `git diff` by itself doesn't show all changes made since your last commit -- only changes that are still unstaged.
--If you've staged all of your changes, `git diff` will give you no output.
-+It's important to note that `git diff` by itself doesn't show all changes made since your last commit – only changes that are still unstaged.
-+This can be confusing, because if you've staged all of your changes, `git diff` will give you no output.
+-It's important to note that `git diff` by itself doesn't show all changes made since your last commit – only changes that are still unstaged.
+-This can be confusing, because if you've staged all of your changes, `git diff` will give you no output.
++[source,console]
++----
++$ git diff --staged
++diff --git a/README b/README
++new file mode 100644
++index 0000000..03902a1
++--- /dev/null
+++++ b/README
++@@ -0,0 +1 @@
+++My Project
++----
++
++It's important to note that `git diff` by itself doesn't show all changes made since your last commit -- only changes that are still unstaged.
++If you've staged all of your changes, `git diff` will give you no output.
  
  For another example, if you stage the `CONTRIBUTING.md` file and then edit it, you can use `git diff` to see the changes in the file that are staged and the changes that are unstaged.
  If our environment looks like this:
  
--[source,console]
------
--$ git add CONTRIBUTING.md
--$ echo '# test line' >> CONTRIBUTING.md
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Changes to be committed:
--  (use "git reset HEAD <file>..." to unstage)
--
--    modified:   CONTRIBUTING.md
--
--Changes not staged for commit:
--  (use "git add <file>..." to update what will be committed)
--  (use "git checkout -- <file>..." to discard changes in working directory)
--
--    modified:   CONTRIBUTING.md
------
--
++[source,console]
++----
++$ git add CONTRIBUTING.md
++$ echo '# test line' >> CONTRIBUTING.md
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Changes to be committed:
++  (use "git reset HEAD <file>..." to unstage)
++
++    modified:   CONTRIBUTING.md
++
++Changes not staged for commit:
++  (use "git add <file>..." to update what will be committed)
++  (use "git checkout -- <file>..." to discard changes in working directory)
++
++    modified:   CONTRIBUTING.md
++----
++
  Now you can use `git diff` to see what is still unstaged:
  
--[source,console]
------
--$ git diff
--diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
--index 643e24f..87f08c8 100644
----- a/CONTRIBUTING.md
--+++ b/CONTRIBUTING.md
--@@ -119,3 +119,4 @@ at the
-- ## Starter Projects
--
-- See our [projects list](https://github.com/libgit2/libgit2/blob/development/PROJECTS.md).
--+# test line
------
--
++[source,console]
++----
++$ git diff
++diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
++index 643e24f..87f08c8 100644
++--- a/CONTRIBUTING.md
+++++ b/CONTRIBUTING.md
++@@ -119,3 +119,4 @@ at the
++ ## Starter Projects
++
++ See our [projects list](https://github.com/libgit2/libgit2/blob/development/PROJECTS.md).
+++# test line
++----
++
  and `git diff --cached` to see what you've staged so far (`--staged` and `--cached` are synonyms):
  
--[source,console]
------
--$ git diff --cached
--diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
--index 8ebb991..643e24f 100644
----- a/CONTRIBUTING.md
--+++ b/CONTRIBUTING.md
--@@ -65,7 +65,8 @@ branch directly, things can get messy.
-- Please include a nice description of your changes when you submit your PR;
-- if we have to read the whole diff to figure out why you're contributing
-- in the first place, you're less likely to get feedback and have your change
---merged in.
--+merged in. Also, split your changes into comprehensive chunks if your patch is
--+longer than a dozen lines.
--
-- If you are starting to work on a particular area, feel free to submit a PR
-- that highlights your work in progress (and note in the PR title that it's
------
--
--[NOTE]
++[source,console]
++----
++$ git diff --cached
++diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
++index 8ebb991..643e24f 100644
++--- a/CONTRIBUTING.md
+++++ b/CONTRIBUTING.md
++@@ -65,7 +65,8 @@ branch directly, things can get messy.
++ Please include a nice description of your changes when you submit your PR;
++ if we have to read the whole diff to figure out why you're contributing
++ in the first place, you're less likely to get feedback and have your change
++-merged in.
+++merged in. Also, split your changes into comprehensive chunks if your patch is
+++longer than a dozen lines.
++
++ If you are starting to work on a particular area, feel free to submit a PR
++ that highlights your work in progress (and note in the PR title that it's
++----
++
++[NOTE]
  .Git Diff in an External Tool
  ====
  We will continue to use the `git diff` command in various ways throughout the rest of the book.
-@@ -405,68 +145,27 @@
+@@ -145,27 +405,68 @@
  Run `git difftool --tool-help` to see what is available on your system.
  ====
  
--[[_committing_changes]]
++[[_committing_changes]]
  ==== Committing Your Changes
  
  Now that your staging area is set up the way you want it, you can commit your changes.
--Remember that anything that is still unstaged -- any files you have created or modified that you haven't run `git add` on since you edited them -- won't go into this commit.
-+Remember that anything that is still unstaged – any files you have created or modified that you haven't run `git add` on since you edited them – won't go into this commit.
+-Remember that anything that is still unstaged – any files you have created or modified that you haven't run `git add` on since you edited them – won't go into this commit.
++Remember that anything that is still unstaged -- any files you have created or modified that you haven't run `git add` on since you edited them -- won't go into this commit.
  They will stay as modified files on your disk.
  In this case, let's say that the last time you ran `git status`, you saw that everything was staged, so you're ready to commit your changes.(((git commands, status)))
  The simplest way to commit is to type `git commit`:(((git commands, commit)))
  
--[source,console]
------
--$ git commit
------
--
++[source,console]
++----
++$ git commit
++----
++
  Doing so launches your editor of choice.
--
--[NOTE]
--====
--This is set by your shell's `EDITOR` environment variable -- usually vim or emacs, although you can configure it with whatever you want using the `git config --global core.editor` command as you saw in <<ch01-getting-started#ch01-getting-started>>.(((editor, changing default)))(((git commands, config)))
--====
-+(This is set by your shell's `$EDITOR` environment variable – usually vim or emacs, although you can configure it with whatever you want using the `git config --global core.editor` command as you saw in <<ch01-introduction#ch01-introduction>>).(((editor, changing default)))(((git commands, config)))
+-(This is set by your shell's `$EDITOR` environment variable – usually vim or emacs, although you can configure it with whatever you want using the `git config --global core.editor` command as you saw in <<ch01-introduction#ch01-introduction>>).(((editor, changing default)))(((git commands, config)))
++
++[NOTE]
++====
++This is set by your shell's `EDITOR` environment variable -- usually vim or emacs, although you can configure it with whatever you want using the `git config --global core.editor` command as you saw in <<ch01-getting-started#ch01-getting-started>>.(((editor, changing default)))(((git commands, config)))
++====
  
  The editor displays the following text (this example is a Vim screen):
  
--[source]
------
--
--# Please enter the commit message for your changes. Lines starting
--# with '#' will be ignored, and an empty message aborts the commit.
--# On branch master
--# Your branch is up-to-date with 'origin/master'.
--#
--# Changes to be committed:
--#	new file:   README
--#	modified:   CONTRIBUTING.md
--#
--~
--~
--~
--".git/COMMIT_EDITMSG" 9L, 283C
------
--
++[source]
++----
++
++# Please enter the commit message for your changes. Lines starting
++# with '#' will be ignored, and an empty message aborts the commit.
++# On branch master
++# Your branch is up-to-date with 'origin/master'.
++#
++# Changes to be committed:
++#	new file:   README
++#	modified:   CONTRIBUTING.md
++#
++~
++~
++~
++".git/COMMIT_EDITMSG" 9L, 283C
++----
++
  You can see that the default commit message contains the latest output of the `git status` command commented out and one empty line on top.
  You can remove these comments and type your commit message, or you can leave them there to help you remember what you're committing.
--
--[NOTE]
--====
--For an even more explicit reminder of what you've modified, you can pass the `-v` option to `git commit`.
--Doing so also puts the diff of your change in the editor so you can see exactly what changes you're committing.
--====
--
-+(For an even more explicit reminder of what you've modified, you can pass the `-v` option to `git commit`.
-+Doing so also puts the diff of your change in the editor so you can see exactly what changes you're committing.)
+-(For an even more explicit reminder of what you've modified, you can pass the `-v` option to `git commit`.
+-Doing so also puts the diff of your change in the editor so you can see exactly what changes you're committing.)
++
++[NOTE]
++====
++For an even more explicit reminder of what you've modified, you can pass the `-v` option to `git commit`.
++Doing so also puts the diff of your change in the editor so you can see exactly what changes you're committing.
++====
++
  When you exit the editor, Git creates your commit with that commit message (with the comments and diff stripped out).
  
  Alternatively, you can type your commit message inline with the `commit` command by specifying it after a `-m` flag, like this:
  
--[source,console]
------
--$ git commit -m "Story 182: fix benchmarks for speed"
--[master 463dc4f] Story 182: fix benchmarks for speed
-- 2 files changed, 2 insertions(+)
-- create mode 100644 README
------
--
++[source,console]
++----
++$ git commit -m "Story 182: fix benchmarks for speed"
++[master 463dc4f] Story 182: fix benchmarks for speed
++ 2 files changed, 2 insertions(+)
++ create mode 100644 README
++----
++
  Now you've created your first commit!
  You can see that the commit has given you some output about itself: which branch you committed to (`master`), what SHA-1 checksum the commit has (`463dc4f`), how many files were changed, and statistics about lines added and removed in the commit.
  
-@@ -476,73 +175,25 @@
+@@ -175,25 +476,73 @@
  
  ==== Skipping the Staging Area
  
--(((staging area, skipping)))
++(((staging area, skipping)))
  Although it can be amazingly useful for crafting commits exactly how you want them, the staging area is sometimes a bit more complex than you need in your workflow.
  If you want to skip the staging area, Git provides a simple shortcut.
  Adding the `-a` option to the `git commit` command makes Git automatically stage every file that is already tracked before doing the commit, letting you skip the `git add` part:
  
--[source,console]
------
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Changes not staged for commit:
--  (use "git add <file>..." to update what will be committed)
--  (use "git checkout -- <file>..." to discard changes in working directory)
--
--    modified:   CONTRIBUTING.md
--
--no changes added to commit (use "git add" and/or "git commit -a")
--$ git commit -a -m 'Add new benchmarks'
--[master 83e38c7] Add new benchmarks
-- 1 file changed, 5 insertions(+), 0 deletions(-)
------
--
++[source,console]
++----
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Changes not staged for commit:
++  (use "git add <file>..." to update what will be committed)
++  (use "git checkout -- <file>..." to discard changes in working directory)
++
++    modified:   CONTRIBUTING.md
++
++no changes added to commit (use "git add" and/or "git commit -a")
++$ git commit -a -m 'Add new benchmarks'
++[master 83e38c7] Add new benchmarks
++ 1 file changed, 5 insertions(+), 0 deletions(-)
++----
++
  Notice how you don't have to run `git add` on the `CONTRIBUTING.md` file in this case before you commit.
  That's because the `-a` flag includes all changed files.
  This is convenient, but be careful; sometimes this flag will cause you to include unwanted changes.
  
--[[_removing_files]]
++[[_removing_files]]
  ==== Removing Files
  
--(((files, removing)))
++(((files, removing)))
  To remove a file from Git, you have to remove it from your tracked files (more accurately, remove it from your staging area) and then commit.
  The `git rm` command does that, and also removes the file from your working directory so you don't see it as an untracked file the next time around.
  
--If you simply remove the file from your working directory, it shows up under the ``Changes not staged for commit'' (that is, _unstaged_) area of your `git status` output:
--
--[source,console]
------
--$ rm PROJECTS.md
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Changes not staged for commit:
--  (use "git add/rm <file>..." to update what will be committed)
--  (use "git checkout -- <file>..." to discard changes in working directory)
--
--        deleted:    PROJECTS.md
--
--no changes added to commit (use "git add" and/or "git commit -a")
------
-+If you simply remove the file from your working directory, it shows up under the ``Changed but not updated'' (that is, _unstaged_) area of your `git status` output:
+-If you simply remove the file from your working directory, it shows up under the ``Changed but not updated'' (that is, _unstaged_) area of your `git status` output:
++If you simply remove the file from your working directory, it shows up under the ``Changes not staged for commit'' (that is, _unstaged_) area of your `git status` output:
++
++[source,console]
++----
++$ rm PROJECTS.md
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Changes not staged for commit:
++  (use "git add/rm <file>..." to update what will be committed)
++  (use "git checkout -- <file>..." to discard changes in working directory)
++
++        deleted:    PROJECTS.md
++
++no changes added to commit (use "git add" and/or "git commit -a")
++----
  
  Then, if you run `git rm`, it stages the file's removal:
  
--[source,console]
------
--$ git rm PROJECTS.md
--rm 'PROJECTS.md'
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Changes to be committed:
--  (use "git reset HEAD <file>..." to unstage)
--
--    deleted:    PROJECTS.md
------
--
++[source,console]
++----
++$ git rm PROJECTS.md
++rm 'PROJECTS.md'
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Changes to be committed:
++  (use "git reset HEAD <file>..." to unstage)
++
++    deleted:    PROJECTS.md
++----
++
  The next time you commit, the file will be gone and no longer tracked.
--If you modified the file or had already added it to the staging area, you must force the removal with the `-f` option.
-+If you modified the file and added it to the index already, you must force the removal with the `-f` option.
+-If you modified the file and added it to the index already, you must force the removal with the `-f` option.
++If you modified the file or had already added it to the staging area, you must force the removal with the `-f` option.
  This is a safety feature to prevent accidental removal of data that hasn't yet been recorded in a snapshot and that can't be recovered from Git.
  
  Another useful thing you may want to do is to keep the file in your working tree but remove it from your staging area.
-@@ -550,71 +201,30 @@
+@@ -201,30 +550,71 @@
  This is particularly useful if you forgot to add something to your `.gitignore` file and accidentally staged it, like a large log file or a bunch of `.a` compiled files.
  To do this, use the `--cached` option:
  
--[source,console]
------
--$ git rm --cached README
------
--
++[source,console]
++----
++$ git rm --cached README
++----
++
  You can pass files, directories, and file-glob patterns to the `git rm` command.
  That means you can do things such as:
  
--[source,console]
------
--$ git rm log/\*.log
------
--
++[source,console]
++----
++$ git rm log/\*.log
++----
++
  Note the backslash (`\`) in front of the `*`.
  This is necessary because Git does its own filename expansion in addition to your shell's filename expansion.
  This command removes all files that have the `.log` extension in the `log/` directory.
  Or, you can do something like this:
  
--[source,console]
------
--$ git rm \*~
------
-+This command removes all files that end with `~`.
+-This command removes all files that end with `~`.
++[source,console]
++----
++$ git rm \*~
++----
  
--This command removes all files whose names end with a `~`.
--
--[[_git_mv]]
++This command removes all files whose names end with a `~`.
++
++[[_git_mv]]
  ==== Moving Files
  
--(((files, moving)))
++(((files, moving)))
  Unlike many other VCS systems, Git doesn't explicitly track file movement.
  If you rename a file in Git, no metadata is stored in Git that tells it you renamed the file.
--However, Git is pretty smart about figuring that out after the fact -- we'll deal with detecting file movement a bit later.
-+However, Git is pretty smart about figuring that out after the fact – we'll deal with detecting file movement a bit later.
+-However, Git is pretty smart about figuring that out after the fact – we'll deal with detecting file movement a bit later.
++However, Git is pretty smart about figuring that out after the fact -- we'll deal with detecting file movement a bit later.
  
  Thus it's a bit confusing that Git has a `mv` command.
  If you want to rename a file in Git, you can run something like:
  
--[source,console]
------
--$ git mv file_from file_to
------
--
++[source,console]
++----
++$ git mv file_from file_to
++----
++
  and it works fine.
  In fact, if you run something like this and look at the status, you'll see that Git considers it a renamed file:
  
--[source,console]
------
--$ git mv README.md README
--$ git status
--On branch master
--Your branch is up-to-date with 'origin/master'.
--Changes to be committed:
--  (use "git reset HEAD <file>..." to unstage)
--
--    renamed:    README.md -> README
------
--
++[source,console]
++----
++$ git mv README.md README
++$ git status
++On branch master
++Your branch is up-to-date with 'origin/master'.
++Changes to be committed:
++  (use "git reset HEAD <file>..." to unstage)
++
++    renamed:    README.md -> README
++----
++
  However, this is equivalent to running something like this:
  
--[source,console]
------
--$ mv README.md README
--$ git rm README.md
--$ git add README
------
--
++[source,console]
++----
++$ mv README.md README
++$ git rm README.md
++$ git add README
++----
++
  Git figures out that it's a rename implicitly, so it doesn't matter if you rename a file that way or with the `mv` command.
--The only real difference is that `git mv` is one command instead of three -- it's a convenience function.
-+The only real difference is that `mv` is one command instead of three – it's a convenience function.
+-The only real difference is that `mv` is one command instead of three – it's a convenience function.
++The only real difference is that `git mv` is one command instead of three -- it's a convenience function.
  More importantly, you can use any tool you like to rename a file, and address the add/rm later, before you commit.
-diff -au ../../git/progit2/progit2/book/02-git-basics/sections/remotes.asc /tmp/book/02-git-basics/sections/remotes.asc.tmp
---- ../../git/progit2/progit2/book/02-git-basics/sections/remotes.asc	2020-07-17 09:06:42.261936072 +0900
-+++ /tmp/book/02-git-basics/sections/remotes.asc.tmp	2020-10-25 09:24:25.633965632 +0900
+diff -au /tmp/book/02-git-basics/sections/remotes.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/remotes.asc
+--- /tmp/book/02-git-basics/sections/remotes.asc.tmp	2020-10-25 11:05:02.167635122 +0900
++++ ../../git/progit2/progit2/book/02-git-basics/sections/remotes.asc	2020-07-17 09:06:42.261936072 +0900
 @@ -1,4 +1,4 @@
--[[_remote_repos]]
-+[[r_remote_repos]]
+-[[r_remote_repos]]
++[[_remote_repos]]
  === Working with Remotes
  
  To be able to collaborate on any Git project, you need to know how to manage your remote repositories.
-@@ -8,233 +8,81 @@
+@@ -8,81 +8,233 @@
  Managing remote repositories includes knowing how to add remote repositories, remove remotes that are no longer valid, manage various remote branches and define them as being tracked or not, and more.
  In this section, we'll cover some of these remote-management skills.
  
--[NOTE]
--.Remote repositories can be on your local machine.
--====
--It is entirely possible that you can be working with a ``remote'' repository that is, in fact, on the same host you are.
--The word ``remote'' does not necessarily imply that the repository is somewhere else on the network or Internet, only that it is elsewhere.
--Working with such a remote repository would still involve all the standard pushing, pulling and fetching operations as with any other remote.
--====
--
++[NOTE]
++.Remote repositories can be on your local machine.
++====
++It is entirely possible that you can be working with a ``remote'' repository that is, in fact, on the same host you are.
++The word ``remote'' does not necessarily imply that the repository is somewhere else on the network or Internet, only that it is elsewhere.
++Working with such a remote repository would still involve all the standard pushing, pulling and fetching operations as with any other remote.
++====
++
  ==== Showing Your Remotes
  
  To see which remote servers you have configured, you can run the `git remote` command.(((git commands, remote)))
  It lists the shortnames of each remote handle you've specified.
--If you've cloned your repository, you should at least see `origin` -- that is the default name Git gives to the server you cloned from:
--
--[source,console]
------
--$ git clone https://github.com/schacon/ticgit
--Cloning into 'ticgit'...
--remote: Reusing existing pack: 1857, done.
--remote: Total 1857 (delta 0), reused 0 (delta 0)
--Receiving objects: 100% (1857/1857), 374.35 KiB | 268.00 KiB/s, done.
--Resolving deltas: 100% (772/772), done.
--Checking connectivity... done.
--$ cd ticgit
--$ git remote
--origin
------
-+If you've cloned your repository, you should at least see origin – that is the default name Git gives to the server you cloned from:
+-If you've cloned your repository, you should at least see origin – that is the default name Git gives to the server you cloned from:
++If you've cloned your repository, you should at least see `origin` -- that is the default name Git gives to the server you cloned from:
++
++[source,console]
++----
++$ git clone https://github.com/schacon/ticgit
++Cloning into 'ticgit'...
++remote: Reusing existing pack: 1857, done.
++remote: Total 1857 (delta 0), reused 0 (delta 0)
++Receiving objects: 100% (1857/1857), 374.35 KiB | 268.00 KiB/s, done.
++Resolving deltas: 100% (772/772), done.
++Checking connectivity... done.
++$ cd ticgit
++$ git remote
++origin
++----
  
  You can also specify `-v`, which shows you the URLs that Git has stored for the shortname to be used when reading and writing to that remote:
  
--[source,console]
------
--$ git remote -v
--origin	https://github.com/schacon/ticgit (fetch)
--origin	https://github.com/schacon/ticgit (push)
------
--
++[source,console]
++----
++$ git remote -v
++origin	https://github.com/schacon/ticgit (fetch)
++origin	https://github.com/schacon/ticgit (push)
++----
++
  If you have more than one remote, the command lists them all.
  For example, a repository with multiple remotes for working with several collaborators might look something like this.
  
--[source,console]
------
--$ cd grit
--$ git remote -v
--bakkdoor  https://github.com/bakkdoor/grit (fetch)
--bakkdoor  https://github.com/bakkdoor/grit (push)
--cho45     https://github.com/cho45/grit (fetch)
--cho45     https://github.com/cho45/grit (push)
--defunkt   https://github.com/defunkt/grit (fetch)
--defunkt   https://github.com/defunkt/grit (push)
--koke      git://github.com/koke/grit.git (fetch)
--koke      git://github.com/koke/grit.git (push)
--origin    [e-mail]:mojombo/grit.git (fetch)
--origin    [e-mail]:mojombo/grit.git (push)
------
--
++[source,console]
++----
++$ cd grit
++$ git remote -v
++bakkdoor  https://github.com/bakkdoor/grit (fetch)
++bakkdoor  https://github.com/bakkdoor/grit (push)
++cho45     https://github.com/cho45/grit (fetch)
++cho45     https://github.com/cho45/grit (push)
++defunkt   https://github.com/defunkt/grit (fetch)
++defunkt   https://github.com/defunkt/grit (push)
++koke      git://github.com/koke/grit.git (fetch)
++koke      git://github.com/koke/grit.git (push)
++origin    [e-mail]:mojombo/grit.git (fetch)
++origin    [e-mail]:mojombo/grit.git (push)
++----
++
  This means we can pull contributions from any of these users pretty easily.
  We may additionally have permission to push to one or more of these, though we can't tell that here.
  
--Notice that these remotes use a variety of protocols; we'll cover more about this in <<ch04-git-on-the-server#_getting_git_on_a_server>>.
-+Notice that these remotes use a variety of protocols; we'll cover more about this in <<ch04-git-server#r_git_on_the_server>>.
+-Notice that these remotes use a variety of protocols; we'll cover more about this in <<ch04-git-server#r_git_on_the_server>>.
++Notice that these remotes use a variety of protocols; we'll cover more about this in <<ch04-git-on-the-server#_getting_git_on_a_server>>.
  
  ==== Adding Remote Repositories
  
--We've mentioned and given some demonstrations of how the `git clone` command implicitly adds the `origin` remote for you.
--Here's how to add a new remote explicitly.(((git commands, remote)))
-+We've mentioned and given some demonstrations of adding remote repositories in previous sections, but here is how to do it explicitly.(((git commands, remote)))
+-We've mentioned and given some demonstrations of adding remote repositories in previous sections, but here is how to do it explicitly.(((git commands, remote)))
++We've mentioned and given some demonstrations of how the `git clone` command implicitly adds the `origin` remote for you.
++Here's how to add a new remote explicitly.(((git commands, remote)))
  To add a new remote Git repository as a shortname you can reference easily, run `git remote add <shortname> <url>`:
  
--[source,console]
------
--$ git remote
--origin
--$ git remote add pb https://github.com/paulboone/ticgit
--$ git remote -v
--origin	https://github.com/schacon/ticgit (fetch)
--origin	https://github.com/schacon/ticgit (push)
--pb	https://github.com/paulboone/ticgit (fetch)
--pb	https://github.com/paulboone/ticgit (push)
------
--
++[source,console]
++----
++$ git remote
++origin
++$ git remote add pb https://github.com/paulboone/ticgit
++$ git remote -v
++origin	https://github.com/schacon/ticgit (fetch)
++origin	https://github.com/schacon/ticgit (push)
++pb	https://github.com/paulboone/ticgit (fetch)
++pb	https://github.com/paulboone/ticgit (push)
++----
++
  Now you can use the string `pb` on the command line in lieu of the whole URL.
  For example, if you want to fetch all the information that Paul has but that you don't yet have in your repository, you can run `git fetch pb`:
  
--[source,console]
------
--$ git fetch pb
--remote: Counting objects: 43, done.
--remote: Compressing objects: 100% (36/36), done.
--remote: Total 43 (delta 10), reused 31 (delta 5)
--Unpacking objects: 100% (43/43), done.
--From https://github.com/paulboone/ticgit
-- * [new branch]      master     -> pb/master
-- * [new branch]      ticgit     -> pb/ticgit
------
--
--Paul's `master` branch is now accessible locally as `pb/master` -- you can merge it into one of your branches, or you can check out a local branch at that point if you want to inspect it.
--We'll go over what branches are and how to use them in much more detail in <<ch03-git-branching#ch03-git-branching>>.
-+Paul's master branch is now accessible locally as `pb/master` – you can merge it into one of your branches, or you can check out a local branch at that point if you want to inspect it.
-+(We'll go over what branches are and how to use them in much more detail in <<ch03-git-branching#ch03-git-branching>>.)
+-Paul's master branch is now accessible locally as `pb/master` – you can merge it into one of your branches, or you can check out a local branch at that point if you want to inspect it.
+-(We'll go over what branches are and how to use them in much more detail in <<ch03-git-branching#ch03-git-branching>>.)
++[source,console]
++----
++$ git fetch pb
++remote: Counting objects: 43, done.
++remote: Compressing objects: 100% (36/36), done.
++remote: Total 43 (delta 10), reused 31 (delta 5)
++Unpacking objects: 100% (43/43), done.
++From https://github.com/paulboone/ticgit
++ * [new branch]      master     -> pb/master
++ * [new branch]      ticgit     -> pb/ticgit
++----
++
++Paul's `master` branch is now accessible locally as `pb/master` -- you can merge it into one of your branches, or you can check out a local branch at that point if you want to inspect it.
++We'll go over what branches are and how to use them in much more detail in <<ch03-git-branching#ch03-git-branching>>.
  
--[[_fetching_and_pulling]]
++[[_fetching_and_pulling]]
  ==== Fetching and Pulling from Your Remotes
  
  As you just saw, to get data from your remote projects, you can run:(((git commands, fetch)))
  
--[source,console]
------
--$ git fetch <remote>
------
--
++[source,console]
++----
++$ git fetch <remote>
++----
++
  The command goes out to that remote project and pulls down all the data from that remote project that you don't have yet.
  After you do this, you should have references to all the branches from that remote, which you can merge in or inspect at any time.
  
  If you clone a repository, the command automatically adds that remote repository under the name ``origin''.
  So, `git fetch origin` fetches any new work that has been pushed to that server since you cloned (or last fetched from) it.
--It's important to note that the `git fetch` command only downloads the data to your local repository -- it doesn't automatically merge it with any of your work or modify what you're currently working on.
-+It's important to note that the `git fetch` command pulls the data to your local repository – it doesn't automatically merge it with any of your work or modify what you're currently working on.
+-It's important to note that the `git fetch` command pulls the data to your local repository – it doesn't automatically merge it with any of your work or modify what you're currently working on.
++It's important to note that the `git fetch` command only downloads the data to your local repository -- it doesn't automatically merge it with any of your work or modify what you're currently working on.
  You have to merge it manually into your work when you're ready.
  
--If your current branch is set up to track a remote branch (see the next section and <<ch03-git-branching#ch03-git-branching>> for more information), you can use the `git pull` command to automatically fetch and then merge that remote branch into your current branch.(((git commands, pull)))
--This may be an easier or more comfortable workflow for you; and by default, the `git clone` command automatically sets up your local `master` branch to track the remote `master` branch (or whatever the default branch is called) on the server you cloned from.
-+If you have a branch set up to track a remote branch (see the next section and <<ch03-git-branching#ch03-git-branching>> for more information), you can use the `git pull` command to automatically fetch and then merge a remote branch into your current branch.(((git commands, pull)))
-+This may be an easier or more comfortable workflow for you; and by default, the `git clone` command automatically sets up your local master branch to track the remote master branch (or whatever the default branch is called) on the server you cloned from.
+-If you have a branch set up to track a remote branch (see the next section and <<ch03-git-branching#ch03-git-branching>> for more information), you can use the `git pull` command to automatically fetch and then merge a remote branch into your current branch.(((git commands, pull)))
+-This may be an easier or more comfortable workflow for you; and by default, the `git clone` command automatically sets up your local master branch to track the remote master branch (or whatever the default branch is called) on the server you cloned from.
++If your current branch is set up to track a remote branch (see the next section and <<ch03-git-branching#ch03-git-branching>> for more information), you can use the `git pull` command to automatically fetch and then merge that remote branch into your current branch.(((git commands, pull)))
++This may be an easier or more comfortable workflow for you; and by default, the `git clone` command automatically sets up your local `master` branch to track the remote `master` branch (or whatever the default branch is called) on the server you cloned from.
  Running `git pull` generally fetches data from the server you originally cloned from and automatically tries to merge it into the code you're currently working on.
  
--[NOTE]
--====
--From git version 2.27 onward, `git pull` will give a warning if the `pull.rebase` variable is not set.
--Git will keep warning you until you set the variable.
--
--If you want the default behavior of git (fast-forward if possible, else create a merge commit):
--`git config --global pull.rebase "false"`
--
--If you want to rebase when pulling:
--`git config --global pull.rebase "true"`
--====
--
--[[_pushing_remotes]]
++[NOTE]
++====
++From git version 2.27 onward, `git pull` will give a warning if the `pull.rebase` variable is not set.
++Git will keep warning you until you set the variable.
++
++If you want the default behavior of git (fast-forward if possible, else create a merge commit):
++`git config --global pull.rebase "false"`
++
++If you want to rebase when pulling:
++`git config --global pull.rebase "true"`
++====
++
++[[_pushing_remotes]]
  ==== Pushing to Your Remotes
  
  When you have your project at a point that you want to share, you have to push it upstream.
--The command for this is simple: `git push <remote> <branch>`.(((git commands, push)))
--If you want to push your `master` branch to your `origin` server (again, cloning generally sets up both of those names for you automatically), then you can run this to push any commits you've done back up to the server:
--
--[source,console]
------
--$ git push origin master
------
-+The command for this is simple: `git push [remote-name] [branch-name]`.(((git commands, push)))
-+If you want to push your master branch to your `origin` server (again, cloning generally sets up both of those names for you automatically), then you can run this to push any commits you've done back up to the server:
+-The command for this is simple: `git push [remote-name] [branch-name]`.(((git commands, push)))
+-If you want to push your master branch to your `origin` server (again, cloning generally sets up both of those names for you automatically), then you can run this to push any commits you've done back up to the server:
++The command for this is simple: `git push <remote> <branch>`.(((git commands, push)))
++If you want to push your `master` branch to your `origin` server (again, cloning generally sets up both of those names for you automatically), then you can run this to push any commits you've done back up to the server:
++
++[source,console]
++----
++$ git push origin master
++----
  
  This command works only if you cloned from a server to which you have write access and if nobody has pushed in the meantime.
  If you and someone else clone at the same time and they push upstream and then you push upstream, your push will rightly be rejected.
--You'll have to fetch their work first and incorporate it into yours before you'll be allowed to push.
-+You'll have to pull down their work first and incorporate it into yours before you'll be allowed to push.
+-You'll have to pull down their work first and incorporate it into yours before you'll be allowed to push.
++You'll have to fetch their work first and incorporate it into yours before you'll be allowed to push.
  See <<ch03-git-branching#ch03-git-branching>> for more detailed information on how to push to remote servers.
  
--[[_inspecting_remote]]
++[[_inspecting_remote]]
  ==== Inspecting a Remote
  
--If you want to see more information about a particular remote, you can use the `git remote show <remote>` command.(((git commands, remote)))
-+If you want to see more information about a particular remote, you can use the `git remote show [remote-name]` command.(((git commands, remote)))
+-If you want to see more information about a particular remote, you can use the `git remote show [remote-name]` command.(((git commands, remote)))
++If you want to see more information about a particular remote, you can use the `git remote show <remote>` command.(((git commands, remote)))
  If you run this command with a particular shortname, such as `origin`, you get something like this:
  
--[source,console]
------
--$ git remote show origin
--* remote origin
--  Fetch URL: https://github.com/schacon/ticgit
--  Push  URL: https://github.com/schacon/ticgit
--  HEAD branch: master
--  Remote branches:
--    master                               tracked
--    dev-branch                           tracked
--  Local branch configured for 'git pull':
--    master merges with remote master
--  Local ref configured for 'git push':
--    master pushes to master (up to date)
------
--
++[source,console]
++----
++$ git remote show origin
++* remote origin
++  Fetch URL: https://github.com/schacon/ticgit
++  Push  URL: https://github.com/schacon/ticgit
++  HEAD branch: master
++  Remote branches:
++    master                               tracked
++    dev-branch                           tracked
++  Local branch configured for 'git pull':
++    master merges with remote master
++  Local ref configured for 'git push':
++    master pushes to master (up to date)
++----
++
  It lists the URL for the remote repository as well as the tracking branch information.
--The command helpfully tells you that if you're on the `master` branch and you run `git pull`, it will automatically merge in the `master` branch on the remote after it fetches all the remote references.
-+The command helpfully tells you that if you're on the master branch and you run `git pull`, it will automatically merge in the master branch on the remote after it fetches all the remote references.
+-The command helpfully tells you that if you're on the master branch and you run `git pull`, it will automatically merge in the master branch on the remote after it fetches all the remote references.
++The command helpfully tells you that if you're on the `master` branch and you run `git pull`, it will automatically merge in the `master` branch on the remote after it fetches all the remote references.
  It also lists all the remote references it has pulled down.
  
  That is a simple example you're likely to encounter.
  When you're using Git more heavily, however, you may see much more information from `git remote show`:
  
--[source,console]
------
--$ git remote show origin
--* remote origin
--  URL: https://github.com/my-org/complex-project
--  Fetch URL: https://github.com/my-org/complex-project
--  Push  URL: https://github.com/my-org/complex-project
--  HEAD branch: master
--  Remote branches:
--    master                           tracked
--    dev-branch                       tracked
--    markdown-strip                   tracked
--    issue-43                         new (next fetch will store in remotes/origin)
--    issue-45                         new (next fetch will store in remotes/origin)
--    refs/remotes/origin/issue-11     stale (use 'git remote prune' to remove)
--  Local branches configured for 'git pull':
--    dev-branch merges with remote dev-branch
--    master     merges with remote master
--  Local refs configured for 'git push':
--    dev-branch                     pushes to dev-branch                     (up to date)
--    markdown-strip                 pushes to markdown-strip                 (up to date)
--    master                         pushes to master                         (up to date)
------
--
++[source,console]
++----
++$ git remote show origin
++* remote origin
++  URL: https://github.com/my-org/complex-project
++  Fetch URL: https://github.com/my-org/complex-project
++  Push  URL: https://github.com/my-org/complex-project
++  HEAD branch: master
++  Remote branches:
++    master                           tracked
++    dev-branch                       tracked
++    markdown-strip                   tracked
++    issue-43                         new (next fetch will store in remotes/origin)
++    issue-45                         new (next fetch will store in remotes/origin)
++    refs/remotes/origin/issue-11     stale (use 'git remote prune' to remove)
++  Local branches configured for 'git pull':
++    dev-branch merges with remote dev-branch
++    master     merges with remote master
++  Local refs configured for 'git push':
++    dev-branch                     pushes to dev-branch                     (up to date)
++    markdown-strip                 pushes to markdown-strip                 (up to date)
++    master                         pushes to master                         (up to date)
++----
++
  This command shows which branch is automatically pushed to when you run `git push` while on certain branches.
--It also shows you which remote branches on the server you don't yet have, which remote branches you have that have been removed from the server, and multiple local branches that are able to merge automatically with their remote-tracking branch when you run `git pull`.
-+It also shows you which remote branches on the server you don't yet have, which remote branches you have that have been removed from the server, and multiple branches that are automatically merged when you run `git pull`.
+-It also shows you which remote branches on the server you don't yet have, which remote branches you have that have been removed from the server, and multiple branches that are automatically merged when you run `git pull`.
++It also shows you which remote branches on the server you don't yet have, which remote branches you have that have been removed from the server, and multiple local branches that are able to merge automatically with their remote-tracking branch when you run `git pull`.
  
--==== Renaming and Removing Remotes
-+==== Removing and Renaming Remotes
+-==== Removing and Renaming Remotes
++==== Renaming and Removing Remotes
  
--You can run `git remote rename` to change a remote's shortname.(((git commands, remote)))
-+If you want to rename a reference you can run `git remote rename` to change a remote's shortname.(((git commands, remote)))
+-If you want to rename a reference you can run `git remote rename` to change a remote's shortname.(((git commands, remote)))
++You can run `git remote rename` to change a remote's shortname.(((git commands, remote)))
  For instance, if you want to rename `pb` to `paul`, you can do so with `git remote rename`:
  
--[source,console]
------
--$ git remote rename pb paul
--$ git remote
--origin
--paul
------
--
--It's worth mentioning that this changes all your remote-tracking branch names, too.
-+It's worth mentioning that this changes your remote branch names, too.
+-It's worth mentioning that this changes your remote branch names, too.
++[source,console]
++----
++$ git remote rename pb paul
++$ git remote
++origin
++paul
++----
++
++It's worth mentioning that this changes all your remote-tracking branch names, too.
  What used to be referenced at `pb/master` is now at `paul/master`.
  
--If you want to remove a remote for some reason -- you've moved the server or are no longer using a particular mirror, or perhaps a contributor isn't contributing anymore -- you can either use `git remote remove` or `git remote rm`:
--
--[source,console]
------
--$ git remote remove paul
--$ git remote
--origin
------
--
--Once you delete the reference to a remote this way, all remote-tracking branches and configuration settings associated with that remote are also deleted.
-+If you want to remove a remote for some reason – you've moved the server or are no longer using a particular mirror, or perhaps a contributor isn't contributing anymore – you can use `git remote rm`:
-diff -au ../../git/progit2/progit2/book/02-git-basics/sections/tagging.asc /tmp/book/02-git-basics/sections/tagging.asc.tmp
---- ../../git/progit2/progit2/book/02-git-basics/sections/tagging.asc	2020-08-29 09:58:24.048195629 +0900
-+++ /tmp/book/02-git-basics/sections/tagging.asc.tmp	2020-10-25 09:24:25.639965914 +0900
-@@ -1,299 +1,77 @@
--[[_git_tagging]]
-+[[r_git_tagging]]
+-If you want to remove a remote for some reason – you've moved the server or are no longer using a particular mirror, or perhaps a contributor isn't contributing anymore – you can use `git remote rm`:
++If you want to remove a remote for some reason -- you've moved the server or are no longer using a particular mirror, or perhaps a contributor isn't contributing anymore -- you can either use `git remote remove` or `git remote rm`:
++
++[source,console]
++----
++$ git remote remove paul
++$ git remote
++origin
++----
++
++Once you delete the reference to a remote this way, all remote-tracking branches and configuration settings associated with that remote are also deleted.
+diff -au /tmp/book/02-git-basics/sections/tagging.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/tagging.asc
+--- /tmp/book/02-git-basics/sections/tagging.asc.tmp	2020-10-25 11:05:02.173635460 +0900
++++ ../../git/progit2/progit2/book/02-git-basics/sections/tagging.asc	2020-08-29 09:58:24.048195629 +0900
+@@ -1,77 +1,299 @@
+-[[r_git_tagging]]
++[[_git_tagging]]
  === Tagging
  
--(((tags)))
--Like most VCSs, Git has the ability to tag specific points in a repository's history as being important.
--Typically, people use this functionality to mark release points (`v1.0`, `v2.0` and so on).
--In this section, you'll learn how to list existing tags, how to create and delete tags, and what the different types of tags are.
-+Like most VCSs, Git has the ability to tag specific points in history as being important.
-+Typically people use this functionality to mark release points (v1.0, and so on).
-+In this section, you'll learn how to list the available tags, how to create new tags, and what the different types of tags are.
+-Like most VCSs, Git has the ability to tag specific points in history as being important.
+-Typically people use this functionality to mark release points (v1.0, and so on).
+-In this section, you'll learn how to list the available tags, how to create new tags, and what the different types of tags are.
++(((tags)))
++Like most VCSs, Git has the ability to tag specific points in a repository's history as being important.
++Typically, people use this functionality to mark release points (`v1.0`, `v2.0` and so on).
++In this section, you'll learn how to list existing tags, how to create and delete tags, and what the different types of tags are.
  
  ==== Listing Your Tags
  
--Listing the existing tags in Git is straightforward.
--Just type `git tag` (with optional `-l` or `--list`):(((git commands, tag)))
-+Listing the available tags in Git is straightforward.
-+Just type `git tag`:(((git commands, tag)))
+-Listing the available tags in Git is straightforward.
+-Just type `git tag`:(((git commands, tag)))
++Listing the existing tags in Git is straightforward.
++Just type `git tag` (with optional `-l` or `--list`):(((git commands, tag)))
  
--[source,console]
------
--$ git tag
--v1.0
--v2.0
------
-+This command lists the tags in alphabetical order; the order in which they appear has no real importance.
+-This command lists the tags in alphabetical order; the order in which they appear has no real importance.
++[source,console]
++----
++$ git tag
++v1.0
++v2.0
++----
  
--This command lists the tags in alphabetical order; the order in which they are displayed has no real importance.
--
--You can also search for tags that match a particular pattern.
-+You can also search for tags with a particular pattern.
+-You can also search for tags with a particular pattern.
++This command lists the tags in alphabetical order; the order in which they are displayed has no real importance.
++
++You can also search for tags that match a particular pattern.
  The Git source repo, for instance, contains more than 500 tags.
--If you're interested only in looking at the 1.8.5 series, you can run this:
--
--[source,console]
------
--$ git tag -l "v1.8.5*"
--v1.8.5
--v1.8.5-rc0
--v1.8.5-rc1
--v1.8.5-rc2
--v1.8.5-rc3
--v1.8.5.1
--v1.8.5.2
--v1.8.5.3
--v1.8.5.4
--v1.8.5.5
------
--
--[NOTE]
--.Listing tag wildcards requires `-l` or `--list` option
--====
--If you want just the entire list of tags, running the command `git tag` implicitly assumes you want a listing and provides one; the use of `-l` or `--list` in this case is optional.
--
--If, however, you're supplying a wildcard pattern to match tag names, the use of `-l` or `--list` is mandatory.
--====
-+If you're only interested in looking at the 1.8.5 series, you can run this:
+-If you're only interested in looking at the 1.8.5 series, you can run this:
++If you're interested only in looking at the 1.8.5 series, you can run this:
++
++[source,console]
++----
++$ git tag -l "v1.8.5*"
++v1.8.5
++v1.8.5-rc0
++v1.8.5-rc1
++v1.8.5-rc2
++v1.8.5-rc3
++v1.8.5.1
++v1.8.5.2
++v1.8.5.3
++v1.8.5.4
++v1.8.5.5
++----
++
++[NOTE]
++.Listing tag wildcards requires `-l` or `--list` option
++====
++If you want just the entire list of tags, running the command `git tag` implicitly assumes you want a listing and provides one; the use of `-l` or `--list` in this case is optional.
++
++If, however, you're supplying a wildcard pattern to match tag names, the use of `-l` or `--list` is mandatory.
++====
  
  ==== Creating Tags
  
--Git supports two types of tags: _lightweight_ and _annotated_.
-+Git uses two main types of tags: lightweight and annotated.
+-Git uses two main types of tags: lightweight and annotated.
++Git supports two types of tags: _lightweight_ and _annotated_.
  
--A lightweight tag is very much like a branch that doesn't change -- it's just a pointer to a specific commit.
-+A lightweight tag is very much like a branch that doesn't change – it's just a pointer to a specific commit.
+-A lightweight tag is very much like a branch that doesn't change – it's just a pointer to a specific commit.
++A lightweight tag is very much like a branch that doesn't change -- it's just a pointer to a specific commit.
  
  Annotated tags, however, are stored as full objects in the Git database.
  They're checksummed; contain the tagger name, email, and date; have a tagging message; and can be signed and verified with GNU Privacy Guard (GPG).
  It's generally recommended that you create annotated tags so you can have all this information; but if you want a temporary tag or for some reason don't want to keep the other information, lightweight tags are available too.
  
--[[_annotated_tags]]
++[[_annotated_tags]]
  ==== Annotated Tags
  
--(((tags, annotated)))
++(((tags, annotated)))
  Creating an annotated tag in Git is simple.
  The easiest way is to specify `-a` when you run the `tag` command:(((git commands, tag)))
  
--[source,console]
------
--$ git tag -a v1.4 -m "my version 1.4"
--$ git tag
--v0.1
--v1.3
--v1.4
------
--
++[source,console]
++----
++$ git tag -a v1.4 -m "my version 1.4"
++$ git tag
++v0.1
++v1.3
++v1.4
++----
++
  The `-m` specifies a tagging message, which is stored with the tag.
  If you don't specify a message for an annotated tag, Git launches your editor so you can type it in.
  
  You can see the tag data along with the commit that was tagged by using the `git show` command:
  
--[source,console]
------
--$ git show v1.4
--tag v1.4
--Tagger: Ben Straub <[e-mail]>
--Date:   Sat May 3 20:19:12 2014 -0700
--
--my version 1.4
--
--commit ca82a6dff817ec66f44342007202690a93763949
--Author: Scott Chacon <[e-mail]>
--Date:   Mon Mar 17 21:52:11 2008 -0700
--
--    Change version number
------
--
- That shows the tagger information, the date the commit was tagged, and the annotation message before showing the commit information.
- 
++[source,console]
++----
++$ git show v1.4
++tag v1.4
++Tagger: Ben Straub <[e-mail]>
++Date:   Sat May 3 20:19:12 2014 -0700
++
++my version 1.4
++
++commit ca82a6dff817ec66f44342007202690a93763949
++Author: Scott Chacon <[e-mail]>
++Date:   Mon Mar 17 21:52:11 2008 -0700
++
++    Change version number
++----
++
+ That shows the tagger information, the date the commit was tagged, and the annotation message before showing the commit information.
+ 
  ==== Lightweight Tags
  
--(((tags, lightweight)))
++(((tags, lightweight)))
  Another way to tag commits is with a lightweight tag.
--This is basically the commit checksum stored in a file -- no other information is kept.
--To create a lightweight tag, don't supply any of the `-a`, `-s`, or `-m` options, just provide a tag name:
--
--[source,console]
------
--$ git tag v1.4-lw
--$ git tag
--v0.1
--v1.3
--v1.4
--v1.4-lw
--v1.5
------
-+This is basically the commit checksum stored in a file – no other information is kept.
-+To create a lightweight tag, don't supply the `-a`, `-s`, or `-m` option:
+-This is basically the commit checksum stored in a file – no other information is kept.
+-To create a lightweight tag, don't supply the `-a`, `-s`, or `-m` option:
++This is basically the commit checksum stored in a file -- no other information is kept.
++To create a lightweight tag, don't supply any of the `-a`, `-s`, or `-m` options, just provide a tag name:
++
++[source,console]
++----
++$ git tag v1.4-lw
++$ git tag
++v0.1
++v1.3
++v1.4
++v1.4-lw
++v1.5
++----
  
  This time, if you run `git show` on the tag, you don't see the extra tag information.(((git commands, show)))
  The command just shows the commit:
  
--[source,console]
------
--$ git show v1.4-lw
--commit ca82a6dff817ec66f44342007202690a93763949
--Author: Scott Chacon <[e-mail]>
--Date:   Mon Mar 17 21:52:11 2008 -0700
--
--    Change version number
------
--
++[source,console]
++----
++$ git show v1.4-lw
++commit ca82a6dff817ec66f44342007202690a93763949
++Author: Scott Chacon <[e-mail]>
++Date:   Mon Mar 17 21:52:11 2008 -0700
++
++    Change version number
++----
++
  ==== Tagging Later
  
  You can also tag commits after you've moved past them.
  Suppose your commit history looks like this:
  
--[source,console]
------
--$ git log --pretty=oneline
--15027957951b64cf874c3557a0f3547bd83b3ff6 Merge branch 'experiment'
--a6b4c97498bd301d84096da251c98a07c7723e65 Create write support
--0d52aaab4479697da7686c15f77a3d64d9165190 One more thing
--6d52a271eda8725415634dd79daabbc4d9b6008e Merge branch 'experiment'
--0b7434d86859cc7b8c3d5e1dddfed66ff742fcbc Add commit function
--4682c3261057305bdd616e23b64b0857d832627b Add todo file
--166ae0c4d3f420721acbb115cc33848dfcc2121a Create write support
--9fceb02d0ae598e95dc970b74767f19372d61af8 Update rakefile
--964f16d36dfccde844893cac5b347e7b3d44abbc Commit the todo
--8a5cbc430f1a9c3d00faaeffd07798508422908a Update readme
------
--
--Now, suppose you forgot to tag the project at v1.2, which was at the ``Update rakefile'' commit.
-+Now, suppose you forgot to tag the project at v1.2, which was at the ``updated rakefile'' commit.
+-Now, suppose you forgot to tag the project at v1.2, which was at the ``updated rakefile'' commit.
++[source,console]
++----
++$ git log --pretty=oneline
++15027957951b64cf874c3557a0f3547bd83b3ff6 Merge branch 'experiment'
++a6b4c97498bd301d84096da251c98a07c7723e65 Create write support
++0d52aaab4479697da7686c15f77a3d64d9165190 One more thing
++6d52a271eda8725415634dd79daabbc4d9b6008e Merge branch 'experiment'
++0b7434d86859cc7b8c3d5e1dddfed66ff742fcbc Add commit function
++4682c3261057305bdd616e23b64b0857d832627b Add todo file
++166ae0c4d3f420721acbb115cc33848dfcc2121a Create write support
++9fceb02d0ae598e95dc970b74767f19372d61af8 Update rakefile
++964f16d36dfccde844893cac5b347e7b3d44abbc Commit the todo
++8a5cbc430f1a9c3d00faaeffd07798508422908a Update readme
++----
++
++Now, suppose you forgot to tag the project at v1.2, which was at the ``Update rakefile'' commit.
  You can add it after the fact.
  To tag that commit, you specify the commit checksum (or part of it) at the end of the command:
  
--[source,console]
------
--$ git tag -a v1.2 9fceb02
------
--
++[source,console]
++----
++$ git tag -a v1.2 9fceb02
++----
++
  You can see that you've tagged the commit:(((git commands, tag)))
  
--[source,console]
------
--$ git tag
--v0.1
--v1.2
--v1.3
--v1.4
--v1.4-lw
--v1.5
--
--$ git show v1.2
--tag v1.2
--Tagger: Scott Chacon <[e-mail]>
--Date:   Mon Feb 9 15:32:16 2009 -0800
--
--version 1.2
--commit 9fceb02d0ae598e95dc970b74767f19372d61af8
--Author: Magnus Chacon <[e-mail]>
--Date:   Sun Apr 27 20:43:35 2008 -0700
--
--    Update rakefile
--...
------
--
--[[_sharing_tags]]
++[source,console]
++----
++$ git tag
++v0.1
++v1.2
++v1.3
++v1.4
++v1.4-lw
++v1.5
++
++$ git show v1.2
++tag v1.2
++Tagger: Scott Chacon <[e-mail]>
++Date:   Mon Feb 9 15:32:16 2009 -0800
++
++version 1.2
++commit 9fceb02d0ae598e95dc970b74767f19372d61af8
++Author: Magnus Chacon <[e-mail]>
++Date:   Sun Apr 27 20:43:35 2008 -0700
++
++    Update rakefile
++...
++----
++
++[[_sharing_tags]]
  ==== Sharing Tags
  
  By default, the `git push` command doesn't transfer tags to remote servers.(((git commands, push)))
  You will have to explicitly push tags to a shared server after you have created them.
--This process is just like sharing remote branches -- you can run `git push origin <tagname>`.
--
--[source,console]
------
--$ git push origin v1.5
--Counting objects: 14, done.
--Delta compression using up to 8 threads.
--Compressing objects: 100% (12/12), done.
--Writing objects: 100% (14/14), 2.05 KiB | 0 bytes/s, done.
--Total 14 (delta 3), reused 0 (delta 0)
--To [e-mail]:schacon/simplegit.git
-- * [new tag]         v1.5 -> v1.5
------
-+This process is just like sharing remote branches – you can run `git push origin [tagname]`.
+-This process is just like sharing remote branches – you can run `git push origin [tagname]`.
++This process is just like sharing remote branches -- you can run `git push origin <tagname>`.
++
++[source,console]
++----
++$ git push origin v1.5
++Counting objects: 14, done.
++Delta compression using up to 8 threads.
++Compressing objects: 100% (12/12), done.
++Writing objects: 100% (14/14), 2.05 KiB | 0 bytes/s, done.
++Total 14 (delta 3), reused 0 (delta 0)
++To [e-mail]:schacon/simplegit.git
++ * [new tag]         v1.5 -> v1.5
++----
  
  If you have a lot of tags that you want to push up at once, you can also use the `--tags` option to the `git push` command.
  This will transfer all of your tags to the remote server that are not already there.
  
--[source,console]
------
--$ git push origin --tags
--Counting objects: 1, done.
--Writing objects: 100% (1/1), 160 bytes | 0 bytes/s, done.
--Total 1 (delta 0), reused 0 (delta 0)
--To [e-mail]:schacon/simplegit.git
-- * [new tag]         v1.4 -> v1.4
-- * [new tag]         v1.4-lw -> v1.4-lw
------
--
++[source,console]
++----
++$ git push origin --tags
++Counting objects: 1, done.
++Writing objects: 100% (1/1), 160 bytes | 0 bytes/s, done.
++Total 1 (delta 0), reused 0 (delta 0)
++To [e-mail]:schacon/simplegit.git
++ * [new tag]         v1.4 -> v1.4
++ * [new tag]         v1.4-lw -> v1.4-lw
++----
++
  Now, when someone else clones or pulls from your repository, they will get all your tags as well.
  
--[NOTE]
--.`git push` pushes both types of tags
--====
--`git push <remote> --tags` will push both lightweight and annotated tags.
--There is currently no option to push only lightweight tags, but if you use `git push <remote> --follow-tags` only annotated tags will be pushed to the remote.
--====
--
--==== Deleting Tags
--
--To delete a tag on your local repository, you can use `git tag -d <tagname>`.
--For example, we could remove our lightweight tag above as follows:
--
--[source,console]
------
--$ git tag -d v1.4-lw
--Deleted tag 'v1.4-lw' (was e7d5add)
------
--
--Note that this does not remove the tag from any remote servers.
--There are two common variations for deleting a tag from a remote server.
--
--The first variation is `git push <remote> :refs/tags/<tagname>`:
--
--[source,console]
------
--$ git push origin :refs/tags/v1.4-lw
--To /[e-mail]:schacon/simplegit.git
-- - [deleted]         v1.4-lw
------
--
--The way to interpret the above is to read it as the null value before the colon is being pushed to the remote tag name, effectively deleting it.
--
--The second (and more intuitive) way to delete a remote tag is with:
--
--[source,console]
------
--$ git push origin --delete <tagname>
------
--
++[NOTE]
++.`git push` pushes both types of tags
++====
++`git push <remote> --tags` will push both lightweight and annotated tags.
++There is currently no option to push only lightweight tags, but if you use `git push <remote> --follow-tags` only annotated tags will be pushed to the remote.
++====
++
++==== Deleting Tags
++
++To delete a tag on your local repository, you can use `git tag -d <tagname>`.
++For example, we could remove our lightweight tag above as follows:
++
++[source,console]
++----
++$ git tag -d v1.4-lw
++Deleted tag 'v1.4-lw' (was e7d5add)
++----
++
++Note that this does not remove the tag from any remote servers.
++There are two common variations for deleting a tag from a remote server.
++
++The first variation is `git push <remote> :refs/tags/<tagname>`:
++
++[source,console]
++----
++$ git push origin :refs/tags/v1.4-lw
++To /[e-mail]:schacon/simplegit.git
++ - [deleted]         v1.4-lw
++----
++
++The way to interpret the above is to read it as the null value before the colon is being pushed to the remote tag name, effectively deleting it.
++
++The second (and more intuitive) way to delete a remote tag is with:
++
++[source,console]
++----
++$ git push origin --delete <tagname>
++----
++
  ==== Checking out Tags
  
--If you want to view the versions of files a tag is pointing to, you can do a `git checkout` of that tag, although this puts your repository in ``detached HEAD'' state, which has some ill side effects:
--
--[source,console]
------
--$ git checkout v2.0.0
--Note: switching to 'v2.0.0'.
--
--You are in 'detached HEAD' state. You can look around, make experimental
--changes and commit them, and you can discard any commits you make in this
--state without impacting any branches by performing another checkout.
--
--If you want to create a new branch to retain commits you create, you may
--do so (now or later) by using -c with the switch command. Example:
--
--  git switch -c <new-branch-name>
--
--Or undo this operation with:
--
--  git switch -
--
--Turn off this advice by setting config variable advice.detachedHead to false
--
--HEAD is now at 99ada87... Merge pull request #89 from schacon/appendix-final
--
--$ git checkout v2.0-beta-0.1
--Previous HEAD position was 99ada87... Merge pull request #89 from schacon/appendix-final
--HEAD is now at df3f601... Add atlas.json and cover image
------
--
--In ``detached HEAD'' state, if you make changes and then create a commit, the tag will stay the same, but your new commit won't belong to any branch and will be unreachable, except by the exact commit hash.
--Thus, if you need to make changes -- say you're fixing a bug on an older version, for instance -- you will generally want to create a branch:
--
--[source,console]
------
--$ git checkout -b version2 v2.0.0
--Switched to a new branch 'version2'
------
-+You can't really check out a tag in Git, since they can't be moved around.
-+If you want to put a version of your repository in your working directory that looks like a specific tag, you can create a new branch at a specific tag with  `git checkout -b [branchname] [tagname]`:
- 
--If you do this and make a commit, your `version2` branch will be slightly different than your `v2.0.0` tag since it will move forward with your new changes, so do be careful.
-+Of course if you do this and do a commit, your `version2` branch will be slightly different than your `v2.0.0` tag since it will move forward with your new changes, so do be careful.
-diff -au ../../git/progit2/progit2/book/02-git-basics/sections/undoing.asc /tmp/book/02-git-basics/sections/undoing.asc.tmp
---- ../../git/progit2/progit2/book/02-git-basics/sections/undoing.asc	2020-10-18 09:42:35.779991668 +0900
-+++ /tmp/book/02-git-basics/sections/undoing.asc.tmp	2020-10-25 09:24:25.644966150 +0900
+-You can't really check out a tag in Git, since they can't be moved around.
+-If you want to put a version of your repository in your working directory that looks like a specific tag, you can create a new branch at a specific tag with  `git checkout -b [branchname] [tagname]`:
++If you want to view the versions of files a tag is pointing to, you can do a `git checkout` of that tag, although this puts your repository in ``detached HEAD'' state, which has some ill side effects:
++
++[source,console]
++----
++$ git checkout v2.0.0
++Note: switching to 'v2.0.0'.
++
++You are in 'detached HEAD' state. You can look around, make experimental
++changes and commit them, and you can discard any commits you make in this
++state without impacting any branches by performing another checkout.
++
++If you want to create a new branch to retain commits you create, you may
++do so (now or later) by using -c with the switch command. Example:
++
++  git switch -c <new-branch-name>
++
++Or undo this operation with:
++
++  git switch -
++
++Turn off this advice by setting config variable advice.detachedHead to false
++
++HEAD is now at 99ada87... Merge pull request #89 from schacon/appendix-final
++
++$ git checkout v2.0-beta-0.1
++Previous HEAD position was 99ada87... Merge pull request #89 from schacon/appendix-final
++HEAD is now at df3f601... Add atlas.json and cover image
++----
++
++In ``detached HEAD'' state, if you make changes and then create a commit, the tag will stay the same, but your new commit won't belong to any branch and will be unreachable, except by the exact commit hash.
++Thus, if you need to make changes -- say you're fixing a bug on an older version, for instance -- you will generally want to create a branch:
++
++[source,console]
++----
++$ git checkout -b version2 v2.0.0
++Switched to a new branch 'version2'
++----
+ 
+-Of course if you do this and do a commit, your `version2` branch will be slightly different than your `v2.0.0` tag since it will move forward with your new changes, so do be careful.
++If you do this and make a commit, your `version2` branch will be slightly different than your `v2.0.0` tag since it will move forward with your new changes, so do be careful.
+diff -au /tmp/book/02-git-basics/sections/undoing.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/undoing.asc
+--- /tmp/book/02-git-basics/sections/undoing.asc.tmp	2020-10-25 11:05:02.179635797 +0900
++++ ../../git/progit2/progit2/book/02-git-basics/sections/undoing.asc	2020-10-18 09:42:35.779991668 +0900
 @@ -1,4 +1,4 @@
--[[_undoing]]
-+[[r_undoing]]
+-[[r_undoing]]
++[[_undoing]]
  === Undoing Things
  
  At any stage, you may want to undo something.
-@@ -7,12 +7,7 @@
+@@ -7,7 +7,12 @@
  This is one of the few areas in Git where you may lose some work if you do it wrong.
  
  One of the common undos takes place when you commit too early and possibly forget to add some files, or you mess up your commit message.
--If you want to redo that commit, make the additional changes you forgot, stage them, and commit again using the `--amend` option:
--
--[source,console]
------
--$ git commit --amend
------
-+If you want to try that commit again, you can run commit with the `--amend` option:
+-If you want to try that commit again, you can run commit with the `--amend` option:
++If you want to redo that commit, make the additional changes you forgot, stage them, and commit again using the `--amend` option:
++
++[source,console]
++----
++$ git commit --amend
++----
  
  This command takes your staging area and uses it for the commit.
  If you've made no changes since your last commit (for instance, you run this command immediately after your previous commit), then your snapshot will look exactly the same, and all you'll change is your commit message.
-@@ -22,214 +17,50 @@
+@@ -17,50 +22,214 @@
  
  As an example, if you commit and then realize you forgot to stage the changes in a file you wanted to add to this commit, you can do something like this:
  
--[source,console]
------
--$ git commit -m 'Initial commit'
--$ git add forgotten_file
--$ git commit --amend
------
--
--You end up with a single commit -- the second commit replaces the results of the first.
--
--[NOTE]
--====
--It's important to understand that when you're amending your last commit, you're not so much fixing it as _replacing_ it entirely with a new, improved commit that pushes the old commit out of the way and puts the new commit in its place.
--Effectively, it's as if the previous commit never happened, and it won't show up in your repository history.
--
--The obvious value to amending commits is to make minor improvements to your last commit, without cluttering your repository history with commit messages of the form, ``Oops, forgot to add a file'' or ``Darn, fixing a typo in last commit''.
--====
--
--[NOTE]
--====
--Only amend commits that are still local and have not been pushed somewhere.
--Amending previously pushed commits and force pushing the branch will cause problems for your collaborators.
--For more on what happens when you do this and how to recover if you're on the receiving end read <<_rebase_peril>>.
--====
-+You end up with a single commit – the second commit replaces the results of the first.
- 
--[[_unstaging]]
+-You end up with a single commit – the second commit replaces the results of the first.
++[source,console]
++----
++$ git commit -m 'Initial commit'
++$ git add forgotten_file
++$ git commit --amend
++----
++
++You end up with a single commit -- the second commit replaces the results of the first.
++
++[NOTE]
++====
++It's important to understand that when you're amending your last commit, you're not so much fixing it as _replacing_ it entirely with a new, improved commit that pushes the old commit out of the way and puts the new commit in its place.
++Effectively, it's as if the previous commit never happened, and it won't show up in your repository history.
++
++The obvious value to amending commits is to make minor improvements to your last commit, without cluttering your repository history with commit messages of the form, ``Oops, forgot to add a file'' or ``Darn, fixing a typo in last commit''.
++====
++
++[NOTE]
++====
++Only amend commits that are still local and have not been pushed somewhere.
++Amending previously pushed commits and force pushing the branch will cause problems for your collaborators.
++For more on what happens when you do this and how to recover if you're on the receiving end read <<_rebase_peril>>.
++====
+ 
++[[_unstaging]]
  ==== Unstaging a Staged File
  
--The next two sections demonstrate how to work with your staging area and working directory changes.
-+The next two sections demonstrate how to wrangle your staging area and working directory changes.
+-The next two sections demonstrate how to wrangle your staging area and working directory changes.
++The next two sections demonstrate how to work with your staging area and working directory changes.
  The nice part is that the command you use to determine the state of those two areas also reminds you how to undo changes to them.
  For example, let's say you've changed two files and want to commit them as two separate changes, but you accidentally type `git add *` and stage them both.
  How can you unstage one of the two?
  The `git status` command reminds you:
  
--[source,console]
------
--$ git add *
--$ git status
--On branch master
--Changes to be committed:
--  (use "git reset HEAD <file>..." to unstage)
--
--    renamed:    README.md -> README
--    modified:   CONTRIBUTING.md
------
--
++[source,console]
++----
++$ git add *
++$ git status
++On branch master
++Changes to be committed:
++  (use "git reset HEAD <file>..." to unstage)
++
++    renamed:    README.md -> README
++    modified:   CONTRIBUTING.md
++----
++
  Right below the ``Changes to be committed'' text, it says use `git reset HEAD <file>...` to unstage.
  So, let's use that advice to unstage the `CONTRIBUTING.md` file:
  
--[source,console]
------
--$ git reset HEAD CONTRIBUTING.md
--Unstaged changes after reset:
--M	CONTRIBUTING.md
--$ git status
--On branch master
--Changes to be committed:
--  (use "git reset HEAD <file>..." to unstage)
--
--    renamed:    README.md -> README
--
--Changes not staged for commit:
--  (use "git add <file>..." to update what will be committed)
--  (use "git checkout -- <file>..." to discard changes in working directory)
--
--    modified:   CONTRIBUTING.md
------
--
++[source,console]
++----
++$ git reset HEAD CONTRIBUTING.md
++Unstaged changes after reset:
++M	CONTRIBUTING.md
++$ git status
++On branch master
++Changes to be committed:
++  (use "git reset HEAD <file>..." to unstage)
++
++    renamed:    README.md -> README
++
++Changes not staged for commit:
++  (use "git add <file>..." to update what will be committed)
++  (use "git checkout -- <file>..." to discard changes in working directory)
++
++    modified:   CONTRIBUTING.md
++----
++
  The command is a bit strange, but it works.
  The `CONTRIBUTING.md` file is modified but once again unstaged.
  
--[NOTE]
++[NOTE]
  =====
--It's true that `git reset` can be a dangerous command, especially if you provide the `--hard` flag.
--However, in the scenario described above, the file in your working directory is not touched, so it's relatively safe.
-+While `git reset` _can_ be a dangerous command if you call it with `--hard`, in this instance the file in your working directory is not touched.
-+Calling `git reset` without an option is not dangerous - it only touches your staging area.
+-While `git reset` _can_ be a dangerous command if you call it with `--hard`, in this instance the file in your working directory is not touched.
+-Calling `git reset` without an option is not dangerous - it only touches your staging area.
++It's true that `git reset` can be a dangerous command, especially if you provide the `--hard` flag.
++However, in the scenario described above, the file in your working directory is not touched, so it's relatively safe.
  =====
  
  For now this magic invocation is all you need to know about the `git reset` command.
--We'll go into much more detail about what `reset` does and how to master it to do really interesting things in <<ch07-git-tools#_git_reset>>.
-+We'll go into much more detail about what `reset` does and how to master it to do really interesting things in <<ch07-git-tools#r_git_reset>>.
+-We'll go into much more detail about what `reset` does and how to master it to do really interesting things in <<ch07-git-tools#r_git_reset>>.
++We'll go into much more detail about what `reset` does and how to master it to do really interesting things in <<ch07-git-tools#_git_reset>>.
  
  ==== Unmodifying a Modified File
  
  What if you realize that you don't want to keep your changes to the `CONTRIBUTING.md` file?
--How can you easily unmodify it -- revert it back to what it looked like when you last committed (or initially cloned, or however you got it into your working directory)?
-+How can you easily unmodify it – revert it back to what it looked like when you last committed (or initially cloned, or however you got it into your working directory)?
+-How can you easily unmodify it – revert it back to what it looked like when you last committed (or initially cloned, or however you got it into your working directory)?
++How can you easily unmodify it -- revert it back to what it looked like when you last committed (or initially cloned, or however you got it into your working directory)?
  Luckily, `git status` tells you how to do that, too.
  In the last example output, the unstaged area looks like this:
  
--[source,console]
------
--Changes not staged for commit:
--  (use "git add <file>..." to update what will be committed)
--  (use "git checkout -- <file>..." to discard changes in working directory)
--
--    modified:   CONTRIBUTING.md
------
--
++[source,console]
++----
++Changes not staged for commit:
++  (use "git add <file>..." to update what will be committed)
++  (use "git checkout -- <file>..." to discard changes in working directory)
++
++    modified:   CONTRIBUTING.md
++----
++
  It tells you pretty explicitly how to discard the changes you've made.
  Let's do what it says:
  
--[source,console]
------
--$ git checkout -- CONTRIBUTING.md
--$ git status
--On branch master
--Changes to be committed:
--  (use "git reset HEAD <file>..." to unstage)
--
--    renamed:    README.md -> README
--
------
--
++[source,console]
++----
++$ git checkout -- CONTRIBUTING.md
++$ git status
++On branch master
++Changes to be committed:
++  (use "git reset HEAD <file>..." to unstage)
++
++    renamed:    README.md -> README
++
++----
++
  You can see that the changes have been reverted.
  
--[IMPORTANT]
++[IMPORTANT]
  =====
  It's important to understand that `git checkout -- <file>` is a dangerous command.
--Any local changes you made to that file are gone -- Git just replaced that file with the most recently-committed version.
--Don't ever use this command unless you absolutely know that you don't want those unsaved local changes.
-+Any changes you made to that file are gone – you just copied another file over it.
-+Don't ever use this command unless you absolutely know that you don't want the file.
+-Any changes you made to that file are gone – you just copied another file over it.
+-Don't ever use this command unless you absolutely know that you don't want the file.
++Any local changes you made to that file are gone -- Git just replaced that file with the most recently-committed version.
++Don't ever use this command unless you absolutely know that you don't want those unsaved local changes.
  =====
  
  If you would like to keep the changes you've made to that file but still need to get it out of the way for now, we'll go over stashing and branching in <<ch03-git-branching#ch03-git-branching>>; these are generally better ways to go.
  
  Remember, anything that is _committed_ in Git can almost always be recovered.
--Even commits that were on branches that were deleted or commits that were overwritten with an `--amend` commit can be recovered (see <<ch10-git-internals#_data_recovery>> for data recovery).
-+Even commits that were on branches that were deleted or commits that were overwritten with an `--amend` commit can be recovered (see <<ch10-git-internals#r_data_recovery>> for data recovery).
+-Even commits that were on branches that were deleted or commits that were overwritten with an `--amend` commit can be recovered (see <<ch10-git-internals#r_data_recovery>> for data recovery).
++Even commits that were on branches that were deleted or commits that were overwritten with an `--amend` commit can be recovered (see <<ch10-git-internals#_data_recovery>> for data recovery).
  However, anything you lose that was never committed is likely never to be seen again.
--
--[[undoing_git_restore]]
--==== Undoing things with git restore
--
--Git version 2.25.0 introduced a new command: `git restore`.
--It's basically an alternative to `git reset` which we just covered.
--From Git version 2.25.0 onwards, Git will use `git restore` instead of `git reset` for many undo operations.
--
--Let's retrace our steps, and undo things with `git restore` instead of `git reset`.
--
--===== Unstaging a Staged File with git restore
--
--The next two sections demonstrate how to work with your staging area and working directory changes with `git restore`.
--The nice part is that the command you use to determine the state of those two areas also reminds you how to undo changes to them.
--For example, let's say you've changed two files and want to commit them as two separate changes, but you accidentally type `git add *` and stage them both.
--How can you unstage one of the two?
--The `git status` command reminds you:
--
--[source,console]
------
--$ git add *
--$ git status
--On branch master
--Changes to be committed:
--  (use "git restore --staged <file>..." to unstage)
--	modified:   CONTRIBUTING.md
--	renamed:    README.md -> README
--
------
--
--Right below the ``Changes to be committed'' text, it says use `git restore --staged <file>...` to unstage.
--So, let's use that advice to unstage the `CONTRIBUTING.md` file:
--
--[source,console]
------
--$ git restore --staged CONTRIBUTING.md
--$ git status
--On branch master
--Changes to be committed:
--  (use "git restore --staged <file>..." to unstage)
--	renamed:    README.md -> README
--
--Changes not staged for commit:
--  (use "git add <file>..." to update what will be committed)
--  (use "git restore <file>..." to discard changes in working directory)
--	modified:   CONTRIBUTING.md
--
------
--
--The `CONTRIBUTING.md` file is modified but once again unstaged.
--
--===== Unmodifying a Modified File with git restore
--
--What if you realize that you don't want to keep your changes to the `CONTRIBUTING.md` file?
--How can you easily unmodify it -- revert it back to what it looked like when you last committed (or initially cloned, or however you got it into your working directory)?
--Luckily, `git status` tells you how to do that, too.
--In the last example output, the unstaged area looks like this:
--
--[source,console]
------
--Changes not staged for commit:
--  (use "git add <file>..." to update what will be committed)
--  (use "git restore <file>..." to discard changes in working directory)
--	modified:   CONTRIBUTING.md
--
------
--
--It tells you pretty explicitly how to discard the changes you've made.
--Let's do what it says:
--
--[source,console]
------
--$ git restore CONTRIBUTING.md
--$ git status
--On branch master
--Changes to be committed:
--  (use "git restore --staged <file>..." to unstage)
--	renamed:    README.md -> README
--
------
--
--[IMPORTANT]
--=====
--It's important to understand that `git restore <file>` is a dangerous command.
--Any local changes you made to that file are gone -- Git just replaced that file with the most recently-committed version.
--Don't ever use this command unless you absolutely know that you don't want those unsaved local changes.
--=====
-diff -au ../../git/progit2/progit2/book/02-git-basics/sections/viewing-history.asc /tmp/book/02-git-basics/sections/viewing-history.asc.tmp
---- ../../git/progit2/progit2/book/02-git-basics/sections/viewing-history.asc	2020-09-26 08:56:07.950296410 +0900
-+++ /tmp/book/02-git-basics/sections/viewing-history.asc.tmp	2020-10-25 09:24:25.649966386 +0900
-@@ -1,213 +1,76 @@
--[[_viewing_history]]
-+[[r_viewing_history]]
++
++[[undoing_git_restore]]
++==== Undoing things with git restore
++
++Git version 2.25.0 introduced a new command: `git restore`.
++It's basically an alternative to `git reset` which we just covered.
++From Git version 2.25.0 onwards, Git will use `git restore` instead of `git reset` for many undo operations.
++
++Let's retrace our steps, and undo things with `git restore` instead of `git reset`.
++
++===== Unstaging a Staged File with git restore
++
++The next two sections demonstrate how to work with your staging area and working directory changes with `git restore`.
++The nice part is that the command you use to determine the state of those two areas also reminds you how to undo changes to them.
++For example, let's say you've changed two files and want to commit them as two separate changes, but you accidentally type `git add *` and stage them both.
++How can you unstage one of the two?
++The `git status` command reminds you:
++
++[source,console]
++----
++$ git add *
++$ git status
++On branch master
++Changes to be committed:
++  (use "git restore --staged <file>..." to unstage)
++	modified:   CONTRIBUTING.md
++	renamed:    README.md -> README
++
++----
++
++Right below the ``Changes to be committed'' text, it says use `git restore --staged <file>...` to unstage.
++So, let's use that advice to unstage the `CONTRIBUTING.md` file:
++
++[source,console]
++----
++$ git restore --staged CONTRIBUTING.md
++$ git status
++On branch master
++Changes to be committed:
++  (use "git restore --staged <file>..." to unstage)
++	renamed:    README.md -> README
++
++Changes not staged for commit:
++  (use "git add <file>..." to update what will be committed)
++  (use "git restore <file>..." to discard changes in working directory)
++	modified:   CONTRIBUTING.md
++
++----
++
++The `CONTRIBUTING.md` file is modified but once again unstaged.
++
++===== Unmodifying a Modified File with git restore
++
++What if you realize that you don't want to keep your changes to the `CONTRIBUTING.md` file?
++How can you easily unmodify it -- revert it back to what it looked like when you last committed (or initially cloned, or however you got it into your working directory)?
++Luckily, `git status` tells you how to do that, too.
++In the last example output, the unstaged area looks like this:
++
++[source,console]
++----
++Changes not staged for commit:
++  (use "git add <file>..." to update what will be committed)
++  (use "git restore <file>..." to discard changes in working directory)
++	modified:   CONTRIBUTING.md
++
++----
++
++It tells you pretty explicitly how to discard the changes you've made.
++Let's do what it says:
++
++[source,console]
++----
++$ git restore CONTRIBUTING.md
++$ git status
++On branch master
++Changes to be committed:
++  (use "git restore --staged <file>..." to unstage)
++	renamed:    README.md -> README
++
++----
++
++[IMPORTANT]
++=====
++It's important to understand that `git restore <file>` is a dangerous command.
++Any local changes you made to that file are gone -- Git just replaced that file with the most recently-committed version.
++Don't ever use this command unless you absolutely know that you don't want those unsaved local changes.
++=====
+diff -au /tmp/book/02-git-basics/sections/viewing-history.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/viewing-history.asc
+--- /tmp/book/02-git-basics/sections/viewing-history.asc.tmp	2020-10-25 11:05:02.185636135 +0900
++++ ../../git/progit2/progit2/book/02-git-basics/sections/viewing-history.asc	2020-09-26 08:56:07.950296410 +0900
+@@ -1,76 +1,213 @@
+-[[r_viewing_history]]
++[[_viewing_history]]
  === Viewing the Commit History
  
  After you have created several commits, or if you have cloned a repository with an existing commit history, you'll probably want to look back to see what has happened.
  The most basic and powerful tool to do this is the `git log` command.
  
  These examples use a very simple project called ``simplegit''.
--To get the project, run:
--
--[source,console]
------
--$ git clone https://github.com/schacon/simplegit-progit
------
-+To get the project, run
+-To get the project, run
++To get the project, run:
++
++[source,console]
++----
++$ git clone https://github.com/schacon/simplegit-progit
++----
  
  When you run `git log` in this project, you should get output that looks something like this:(((git commands, log)))
  
--[source,console]
------
--$ git log
--commit ca82a6dff817ec66f44342007202690a93763949
--Author: Scott Chacon <[e-mail]>
--Date:   Mon Mar 17 21:52:11 2008 -0700
--
--    Change version number
--
--commit 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7
--Author: Scott Chacon <[e-mail]>
--Date:   Sat Mar 15 16:40:33 2008 -0700
--
--    Remove unnecessary test
--
--commit a11bef06a3f659402fe7563abf99ad00de2209e6
--Author: Scott Chacon <[e-mail]>
--Date:   Sat Mar 15 10:31:28 2008 -0700
--
--    Initial commit
------
--
--By default, with no arguments, `git log` lists the commits made in that repository in reverse chronological order; that is, the most recent commits show up first.
-+By default, with no arguments, `git log` lists the commits made in that repository in reverse chronological order – that is, the most recent commits show up first.
+-By default, with no arguments, `git log` lists the commits made in that repository in reverse chronological order – that is, the most recent commits show up first.
++[source,console]
++----
++$ git log
++commit ca82a6dff817ec66f44342007202690a93763949
++Author: Scott Chacon <[e-mail]>
++Date:   Mon Mar 17 21:52:11 2008 -0700
++
++    Change version number
++
++commit 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7
++Author: Scott Chacon <[e-mail]>
++Date:   Sat Mar 15 16:40:33 2008 -0700
++
++    Remove unnecessary test
++
++commit a11bef06a3f659402fe7563abf99ad00de2209e6
++Author: Scott Chacon <[e-mail]>
++Date:   Sat Mar 15 10:31:28 2008 -0700
++
++    Initial commit
++----
++
++By default, with no arguments, `git log` lists the commits made in that repository in reverse chronological order; that is, the most recent commits show up first.
  As you can see, this command lists each commit with its SHA-1 checksum, the author's name and email, the date written, and the commit message.
  
  A huge number and variety of options to the `git log` command are available to show you exactly what you're looking for.
  Here, we'll show you some of the most popular.
  
--One of the more helpful options is `-p` or `--patch`, which shows the difference (the _patch_ output) introduced in each commit.
--You can also limit the number of log entries displayed, such as using `-2` to show only the last two entries.
--
--[source,console]
------
--$ git log -p -2
--commit ca82a6dff817ec66f44342007202690a93763949
--Author: Scott Chacon <[e-mail]>
--Date:   Mon Mar 17 21:52:11 2008 -0700
--
--    Change version number
--
--diff --git a/Rakefile b/Rakefile
--index a874b73..8f94139 100644
----- a/Rakefile
--+++ b/Rakefile
--@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
-- spec = Gem::Specification.new do |s|
--     s.platform  =   Gem::Platform::RUBY
--     s.name      =   "simplegit"
---    s.version   =   "0.1.0"
--+    s.version   =   "0.1.1"
--     s.author    =   "Scott Chacon"
--     s.email     =   "[e-mail]"
--     s.summary   =   "A simple gem for using Git in Ruby code."
--
--commit 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7
--Author: Scott Chacon <[e-mail]>
--Date:   Sat Mar 15 16:40:33 2008 -0700
--
--    Remove unnecessary test
--
--diff --git a/lib/simplegit.rb b/lib/simplegit.rb
--index a0a60ae..47c6340 100644
----- a/lib/simplegit.rb
--+++ b/lib/simplegit.rb
--@@ -18,8 +18,3 @@ class SimpleGit
--     end
--
-- end
---
---if $0 == __FILE__
---  git = SimpleGit.new
---  puts git.show
---end
------
-+One of the more helpful options is `-p`, which shows the difference introduced in each commit.
-+You can also use `-2`, which limits the output to only the last two entries:
+-One of the more helpful options is `-p`, which shows the difference introduced in each commit.
+-You can also use `-2`, which limits the output to only the last two entries:
++One of the more helpful options is `-p` or `--patch`, which shows the difference (the _patch_ output) introduced in each commit.
++You can also limit the number of log entries displayed, such as using `-2` to show only the last two entries.
++
++[source,console]
++----
++$ git log -p -2
++commit ca82a6dff817ec66f44342007202690a93763949
++Author: Scott Chacon <[e-mail]>
++Date:   Mon Mar 17 21:52:11 2008 -0700
++
++    Change version number
++
++diff --git a/Rakefile b/Rakefile
++index a874b73..8f94139 100644
++--- a/Rakefile
+++++ b/Rakefile
++@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
++ spec = Gem::Specification.new do |s|
++     s.platform  =   Gem::Platform::RUBY
++     s.name      =   "simplegit"
++-    s.version   =   "0.1.0"
+++    s.version   =   "0.1.1"
++     s.author    =   "Scott Chacon"
++     s.email     =   "[e-mail]"
++     s.summary   =   "A simple gem for using Git in Ruby code."
++
++commit 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7
++Author: Scott Chacon <[e-mail]>
++Date:   Sat Mar 15 16:40:33 2008 -0700
++
++    Remove unnecessary test
++
++diff --git a/lib/simplegit.rb b/lib/simplegit.rb
++index a0a60ae..47c6340 100644
++--- a/lib/simplegit.rb
+++++ b/lib/simplegit.rb
++@@ -18,8 +18,3 @@ class SimpleGit
++     end
++
++ end
++-
++-if $0 == __FILE__
++-  git = SimpleGit.new
++-  puts git.show
++-end
++----
  
  This option displays the same information but with a diff directly following each entry.
  This is very helpful for code review or to quickly browse what happened during a series of commits that a collaborator has added.
  You can also use a series of summarizing options with `git log`.
  For example, if you want to see some abbreviated stats for each commit, you can use the `--stat` option:
  
--[source,console]
------
--$ git log --stat
--commit ca82a6dff817ec66f44342007202690a93763949
--Author: Scott Chacon <[e-mail]>
--Date:   Mon Mar 17 21:52:11 2008 -0700
--
--    Change version number
--
-- Rakefile | 2 +-
-- 1 file changed, 1 insertion(+), 1 deletion(-)
--
--commit 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7
--Author: Scott Chacon <[e-mail]>
--Date:   Sat Mar 15 16:40:33 2008 -0700
--
--    Remove unnecessary test
--
-- lib/simplegit.rb | 5 -----
-- 1 file changed, 5 deletions(-)
--
--commit a11bef06a3f659402fe7563abf99ad00de2209e6
--Author: Scott Chacon <[e-mail]>
--Date:   Sat Mar 15 10:31:28 2008 -0700
--
--    Initial commit
--
-- README           |  6 ++++++
-- Rakefile         | 23 +++++++++++++++++++++++
-- lib/simplegit.rb | 25 +++++++++++++++++++++++++
-- 3 files changed, 54 insertions(+)
------
--
++[source,console]
++----
++$ git log --stat
++commit ca82a6dff817ec66f44342007202690a93763949
++Author: Scott Chacon <[e-mail]>
++Date:   Mon Mar 17 21:52:11 2008 -0700
++
++    Change version number
++
++ Rakefile | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++commit 085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7
++Author: Scott Chacon <[e-mail]>
++Date:   Sat Mar 15 16:40:33 2008 -0700
++
++    Remove unnecessary test
++
++ lib/simplegit.rb | 5 -----
++ 1 file changed, 5 deletions(-)
++
++commit a11bef06a3f659402fe7563abf99ad00de2209e6
++Author: Scott Chacon <[e-mail]>
++Date:   Sat Mar 15 10:31:28 2008 -0700
++
++    Initial commit
++
++ README           |  6 ++++++
++ Rakefile         | 23 +++++++++++++++++++++++
++ lib/simplegit.rb | 25 +++++++++++++++++++++++++
++ 3 files changed, 54 insertions(+)
++----
++
  As you can see, the `--stat` option prints below each commit entry a list of modified files, how many files were changed, and how many lines in those files were added and removed.
  It also puts a summary of the information at the end.
  
  Another really useful option is `--pretty`.
  This option changes the log output to formats other than the default.
--A few prebuilt option values are available for you to use.
--The `oneline` value for this option prints each commit on a single line, which is useful if you're looking at a lot of commits.
--In addition, the `short`, `full`, and `fuller` values show the output in roughly the same format but with less or more information, respectively:
--
--[source,console]
------
--$ git log --pretty=oneline
--ca82a6dff817ec66f44342007202690a93763949 Change version number
--085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7 Remove unnecessary test
--a11bef06a3f659402fe7563abf99ad00de2209e6 Initial commit
------
--
--The most interesting option value is `format`, which allows you to specify your own log output format.
--This is especially useful when you're generating output for machine parsing -- because you specify the format explicitly, you know it won't change with updates to Git:(((log formatting)))
--
--[source,console]
------
--$ git log --pretty=format:"%h - %an, %ar : %s"
--ca82a6d - Scott Chacon, 6 years ago : Change version number
--085bb3b - Scott Chacon, 6 years ago : Remove unnecessary test
--a11bef0 - Scott Chacon, 6 years ago : Initial commit
------
-+A few prebuilt options are available for you to use.
-+The `oneline` option prints each commit on a single line, which is useful if you're looking at a lot of commits.
-+In addition, the `short`, `full`, and `fuller` options show the output in roughly the same format but with less or more information, respectively:
+-A few prebuilt options are available for you to use.
+-The `oneline` option prints each commit on a single line, which is useful if you're looking at a lot of commits.
+-In addition, the `short`, `full`, and `fuller` options show the output in roughly the same format but with less or more information, respectively:
++A few prebuilt option values are available for you to use.
++The `oneline` value for this option prints each commit on a single line, which is useful if you're looking at a lot of commits.
++In addition, the `short`, `full`, and `fuller` values show the output in roughly the same format but with less or more information, respectively:
++
++[source,console]
++----
++$ git log --pretty=oneline
++ca82a6dff817ec66f44342007202690a93763949 Change version number
++085bb3bcb608e1e8451d4b2432f8ecbe6306e7e7 Remove unnecessary test
++a11bef06a3f659402fe7563abf99ad00de2209e6 Initial commit
++----
++
++The most interesting option value is `format`, which allows you to specify your own log output format.
++This is especially useful when you're generating output for machine parsing -- because you specify the format explicitly, you know it won't change with updates to Git:(((log formatting)))
++
++[source,console]
++----
++$ git log --pretty=format:"%h - %an, %ar : %s"
++ca82a6d - Scott Chacon, 6 years ago : Change version number
++085bb3b - Scott Chacon, 6 years ago : Remove unnecessary test
++a11bef0 - Scott Chacon, 6 years ago : Initial commit
++----
  
--<<pretty_format>> lists some of the more useful specifiers that `format` takes.
-+The most interesting option is `format`, which allows you to specify your own log output format.
-+This is especially useful when you're generating output for machine parsing – because you specify the format explicitly, you know it won't change with updates to Git:(((log formatting)))
+-The most interesting option is `format`, which allows you to specify your own log output format.
+-This is especially useful when you're generating output for machine parsing – because you specify the format explicitly, you know it won't change with updates to Git:(((log formatting)))
++<<pretty_format>> lists some of the more useful specifiers that `format` takes.
  
--[[pretty_format]]
--.Useful specifiers for `git log --pretty=format`
-+<<rpretty_format>> lists some of the more useful options that format takes.
-+
-+.Useful options for `git log --pretty=format`
+-<<rpretty_format>> lists some of the more useful options that format takes.
+-
+-.Useful options for `git log --pretty=format`
++[[pretty_format]]
++.Useful specifiers for `git log --pretty=format`
  [cols="1,4",options="header"]
  |================================
--| Specifier | Description of Output
--| `%H`      | Commit hash
--| `%h`      | Abbreviated commit hash
--| `%T`      | Tree hash
--| `%t`      | Abbreviated tree hash
--| `%P`      | Parent hashes
--| `%p`      | Abbreviated parent hashes
--| `%an`     | Author name
--| `%ae`     | Author email
--| `%ad`     | Author date (format respects the --date=option)
--| `%ar`     | Author date, relative
--| `%cn`     | Committer name
--| `%ce`     | Committer email
--| `%cd`     | Committer date
--| `%cr`     | Committer date, relative
--| `%s`      | Subject
-+| Option   | Description of Output
-+| `%H`     | Commit hash
-+| `%h`     | Abbreviated commit hash
-+| `%T`     | Tree hash
-+| `%t`     | Abbreviated tree hash
-+| `%P`     | Parent hashes
-+| `%p`     | Abbreviated parent hashes
-+| `%an`    | Author name
-+| `%ae`    | Author email
-+| `%ad`    | Author date (format respects the --date=option)
-+| `%ar`    | Author date, relative
-+| `%cn`    | Committer name
-+| `%ce`    | Committer email
-+| `%cd`    | Committer date
-+| `%cr`    | Committer date, relative
-+| `%s`     | Subject
+-| Option   | Description of Output
+-| `%H`     | Commit hash
+-| `%h`     | Abbreviated commit hash
+-| `%T`     | Tree hash
+-| `%t`     | Abbreviated tree hash
+-| `%P`     | Parent hashes
+-| `%p`     | Abbreviated parent hashes
+-| `%an`    | Author name
+-| `%ae`    | Author email
+-| `%ad`    | Author date (format respects the --date=option)
+-| `%ar`    | Author date, relative
+-| `%cn`    | Committer name
+-| `%ce`    | Committer email
+-| `%cd`    | Committer date
+-| `%cr`    | Committer date, relative
+-| `%s`     | Subject
++| Specifier | Description of Output
++| `%H`      | Commit hash
++| `%h`      | Abbreviated commit hash
++| `%T`      | Tree hash
++| `%t`      | Abbreviated tree hash
++| `%P`      | Parent hashes
++| `%p`      | Abbreviated parent hashes
++| `%an`     | Author name
++| `%ae`     | Author email
++| `%ad`     | Author date (format respects the --date=option)
++| `%ar`     | Author date, relative
++| `%cn`     | Committer name
++| `%ce`     | Committer email
++| `%cd`     | Committer date
++| `%cr`     | Committer date, relative
++| `%s`      | Subject
  |================================
  
  You may be wondering what the difference is between _author_ and _committer_.
  The author is the person who originally wrote the work, whereas the committer is the person who last applied the work.
--So, if you send in a patch to a project and one of the core members applies the patch, both of you get credit -- you as the author, and the core member as the committer.
-+So, if you send in a patch to a project and one of the core members applies the patch, both of you get credit – you as the author, and the core member as the committer.
+-So, if you send in a patch to a project and one of the core members applies the patch, both of you get credit – you as the author, and the core member as the committer.
++So, if you send in a patch to a project and one of the core members applies the patch, both of you get credit -- you as the author, and the core member as the committer.
  We'll cover this distinction a bit more in <<ch05-distributed-git#ch05-distributed-git>>.
  
--The `oneline` and `format` option values are particularly useful with another `log` option called `--graph`.
-+The `oneline` and `format` options are particularly useful with another `log` option called `--graph`.
+-The `oneline` and `format` options are particularly useful with another `log` option called `--graph`.
++The `oneline` and `format` option values are particularly useful with another `log` option called `--graph`.
  This option adds a nice little ASCII graph showing your branch and merge history:
  
--[source,console]
------
--$ git log --pretty=format:"%h %s" --graph
--* 2d3acf9 Ignore errors from SIGCHLD on trap
--*  5e3ee11 Merge branch 'master' of git://github.com/dustin/grit
--|\
--| * 420eac9 Add method for getting the current branch
--* | 30e367c Timeout code and tests
--* | 5a09431 Add timeout protection to grit
--* | e1193f8 Support for heads with slashes in them
--|/
--* d6016bc Require time for xmlschema
--*  11d191e Merge branch 'defunkt' into local
------
--
++[source,console]
++----
++$ git log --pretty=format:"%h %s" --graph
++* 2d3acf9 Ignore errors from SIGCHLD on trap
++*  5e3ee11 Merge branch 'master' of git://github.com/dustin/grit
++|\
++| * 420eac9 Add method for getting the current branch
++* | 30e367c Timeout code and tests
++* | 5a09431 Add timeout protection to grit
++* | e1193f8 Support for heads with slashes in them
++|/
++* d6016bc Require time for xmlschema
++*  11d191e Merge branch 'defunkt' into local
++----
++
  This type of output will become more interesting as we go through branching and merging in the next chapter.
  
--Those are only some simple output-formatting options to `git log` -- there are many more.
--<<log_options>> lists the options we've covered so far, as well as some other common formatting options that may be useful, along with how they change the output of the log command.
-+Those are only some simple output-formatting options to `git log` – there are many more.
-+<<rlog_options>> lists the options we've covered so far, as well as some other common formatting options that may be useful, along with how they change the output of the log command.
+-Those are only some simple output-formatting options to `git log` – there are many more.
+-<<rlog_options>> lists the options we've covered so far, as well as some other common formatting options that may be useful, along with how they change the output of the log command.
++Those are only some simple output-formatting options to `git log` -- there are many more.
++<<log_options>> lists the options we've covered so far, as well as some other common formatting options that may be useful, along with how they change the output of the log command.
  
--[[log_options]]
++[[log_options]]
  .Common options to `git log`
  [cols="1,4",options="header"]
  |================================
-@@ -220,63 +83,39 @@
+@@ -83,39 +220,63 @@
  | `--abbrev-commit` | Show only the first few characters of the SHA-1 checksum instead of all 40.
  | `--relative-date` | Display the date in a relative format (for example, ``2 weeks ago'') instead of using the full date format.
  | `--graph`         | Display an ASCII graph of the branch and merge history beside the log output.
--| `--pretty`        | Show commits in an alternate format. Option values include oneline, short, full, fuller, and format (where you specify your own format).
--| `--oneline`       | Shorthand for `--pretty=oneline --abbrev-commit` used together.
-+| `--pretty`        | Show commits in an alternate format. Options include oneline, short, full, fuller, and format (where you specify your own format).
+-| `--pretty`        | Show commits in an alternate format. Options include oneline, short, full, fuller, and format (where you specify your own format).
++| `--pretty`        | Show commits in an alternate format. Option values include oneline, short, full, fuller, and format (where you specify your own format).
++| `--oneline`       | Shorthand for `--pretty=oneline --abbrev-commit` used together.
  |================================
  
  ==== Limiting Log Output
  
--In addition to output-formatting options, `git log` takes a number of useful limiting options; that is, options that let you show only a subset of commits.
--You've seen one such option already -- the `-2` option, which displays only the last two commits.
-+In addition to output-formatting options, `git log` takes a number of useful limiting options – that is, options that let you show only a subset of commits.
-+You've seen one such option already – the `-2` option, which show only the last two commits.
+-In addition to output-formatting options, `git log` takes a number of useful limiting options – that is, options that let you show only a subset of commits.
+-You've seen one such option already – the `-2` option, which show only the last two commits.
++In addition to output-formatting options, `git log` takes a number of useful limiting options; that is, options that let you show only a subset of commits.
++You've seen one such option already -- the `-2` option, which displays only the last two commits.
  In fact, you can do `-<n>`, where `n` is any integer to show the last `n` commits.
  In reality, you're unlikely to use that often, because Git by default pipes all output through a pager so you see only one page of log output at a time.
  
  However, the time-limiting options such as `--since` and `--until` are very useful.
  For example, this command gets the list of commits made in the last two weeks:
  
--[source,console]
------
--$ git log --since=2.weeks
------
--
--This command works with lots of formats -- you can specify a specific date like `"2008-01-15"`, or a relative date such as `"2 years 1 day 3 minutes ago"`.
-+This command works with lots of formats – you can specify a specific date like `"2008-01-15"`, or a relative date such as `"2 years 1 day 3 minutes ago"`.
+-This command works with lots of formats – you can specify a specific date like `"2008-01-15"`, or a relative date such as `"2 years 1 day 3 minutes ago"`.
++[source,console]
++----
++$ git log --since=2.weeks
++----
++
++This command works with lots of formats -- you can specify a specific date like `"2008-01-15"`, or a relative date such as `"2 years 1 day 3 minutes ago"`.
  
  You can also filter the list to commits that match some search criteria.
  The `--author` option allows you to filter on a specific author, and the `--grep` option lets you search for keywords in the commit messages.
-+(Note that if you want to specify both author and grep options, you have to add `--all-match` or the command will match commits with either.)
- 
--[NOTE]
--====
--You can specify more than one instance of both the `--author` and `--grep` search criteria, which
--will limit the commit output to commits that match _any_ of the `--author` patterns and _any_
--of the `--grep` patterns; however, adding the `--all-match` option further limits the output to
--just those commits that match _all_ `--grep` patterns.
--====
--
--Another really helpful filter is the `-S` option (colloquially referred to as Git's ``pickaxe'' option), which takes a string and shows only those commits that changed the number of occurrences of that string.
-+Another really helpful filter is the `-S` option which takes a string and only shows the commits that introduced a change to the code that added or removed that string.
+-(Note that if you want to specify both author and grep options, you have to add `--all-match` or the command will match commits with either.)
+ 
+-Another really helpful filter is the `-S` option which takes a string and only shows the commits that introduced a change to the code that added or removed that string.
++[NOTE]
++====
++You can specify more than one instance of both the `--author` and `--grep` search criteria, which
++will limit the commit output to commits that match _any_ of the `--author` patterns and _any_
++of the `--grep` patterns; however, adding the `--all-match` option further limits the output to
++just those commits that match _all_ `--grep` patterns.
++====
++
++Another really helpful filter is the `-S` option (colloquially referred to as Git's ``pickaxe'' option), which takes a string and shows only those commits that changed the number of occurrences of that string.
  For instance, if you wanted to find the last commit that added or removed a reference to a specific function, you could call:
  
--[source,console]
------
--$ git log -S function_name
------
--
++[source,console]
++----
++$ git log -S function_name
++----
++
  The last really useful option to pass to `git log` as a filter is a path.
  If you specify a directory or file name, you can limit the log output to commits that introduced a change to those files.
--This is always the last option and is generally preceded by double dashes (`--`) to separate the paths from the options:
--
--[source,console]
------
--$ git log -- path/to/file
------
-+This is always the last option and is generally preceded by double dashes (`--`) to separate the paths from the options.
+-This is always the last option and is generally preceded by double dashes (`--`) to separate the paths from the options.
++This is always the last option and is generally preceded by double dashes (`--`) to separate the paths from the options:
++
++[source,console]
++----
++$ git log -- path/to/file
++----
  
--In <<limit_options>> we'll list these and a few other common options for your reference.
-+In <<rlimit_options>> we'll list these and a few other common options for your reference.
+-In <<rlimit_options>> we'll list these and a few other common options for your reference.
++In <<limit_options>> we'll list these and a few other common options for your reference.
  
--[[limit_options]]
++[[limit_options]]
  .Options to limit the output of `git log`
  [cols="2,4",options="header"]
  |================================
  | Option                | Description
--| `-<n>`                | Show only the last n commits
-+| `-(n)`                | Show only the last n commits
+-| `-(n)`                | Show only the last n commits
++| `-<n>`                | Show only the last n commits
  | `--since`, `--after`  | Limit the commits to those made after the specified date.
  | `--until`, `--before` | Limit the commits to those made before the specified date.
  | `--author`            | Only show commits in which the author entry matches the specified string.
-@@ -285,25 +124,6 @@
+@@ -124,6 +285,25 @@
  | `-S`                  | Only show commits adding or removing code matching the string
  |================================
  
--For example, if you want to see which commits modifying test files in the Git source code history were committed by Junio Hamano in the month of October 2008 and are not merge commits, you can run something like this:(((log filtering)))
--
--[source,console]
------
--$ git log --pretty="%h - %s" --author='Junio C Hamano' --since="2008-10-01" \
--   --before="2008-11-01" --no-merges -- t/
--5610e3b - Fix testcase failure when extended attributes are in use
--acd3b9e - Enhance hold_lock_file_for_{update,append}() API
--f563754 - demonstrate breakage of detached checkout with symbolic link HEAD
--d1a43f2 - reset --hard/read-tree --reset -u: remove unmerged new paths
--51a94af - Fix "checkout --track -b newbranch" on detached HEAD
--b0ad11e - pull: allow "git pull origin $something:$current_branch" into an unborn branch
------
-+For example, if you want to see which commits modifying test files in the Git source code history are merged and were committed by Junio Hamano in the month of October 2008, you can run something like this:(((log filtering)))
+-For example, if you want to see which commits modifying test files in the Git source code history are merged and were committed by Junio Hamano in the month of October 2008, you can run something like this:(((log filtering)))
++For example, if you want to see which commits modifying test files in the Git source code history were committed by Junio Hamano in the month of October 2008 and are not merge commits, you can run something like this:(((log filtering)))
++
++[source,console]
++----
++$ git log --pretty="%h - %s" --author='Junio C Hamano' --since="2008-10-01" \
++   --before="2008-11-01" --no-merges -- t/
++5610e3b - Fix testcase failure when extended attributes are in use
++acd3b9e - Enhance hold_lock_file_for_{update,append}() API
++f563754 - demonstrate breakage of detached checkout with symbolic link HEAD
++d1a43f2 - reset --hard/read-tree --reset -u: remove unmerged new paths
++51a94af - Fix "checkout --track -b newbranch" on detached HEAD
++b0ad11e - pull: allow "git pull origin $something:$current_branch" into an unborn branch
++----
  
  Of the nearly 40,000 commits in the Git source code history, this command shows the 6 that match those criteria.
--
--[TIP]
--.Preventing the display of merge commits
--====
--Depending on the workflow used in your repository, it's possible that a sizable percentage of the commits in your log history are just merge commits, which typically aren't very informative.
--To prevent the display of merge commits cluttering up your log history, simply add the log option `--no-merges`.
--====
-diff -au ../../git/progit2/progit2/book/03-git-branching/sections/basic-branching-and-merging.asc /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp
---- ../../git/progit2/progit2/book/03-git-branching/sections/basic-branching-and-merging.asc	2020-07-04 16:36:46.720685416 +0900
-+++ /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp	2020-10-25 09:24:25.655966668 +0900
++
++[TIP]
++.Preventing the display of merge commits
++====
++Depending on the workflow used in your repository, it's possible that a sizable percentage of the commits in your log history are just merge commits, which typically aren't very informative.
++To prevent the display of merge commits cluttering up your log history, simply add the log option `--no-merges`.
++====
+diff -au /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp ../../git/progit2/progit2/book/03-git-branching/sections/basic-branching-and-merging.asc
+--- /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp	2020-10-25 11:05:02.191636472 +0900
++++ ../../git/progit2/progit2/book/03-git-branching/sections/basic-branching-and-merging.asc	2020-07-04 16:36:46.720685416 +0900
 @@ -3,8 +3,8 @@
  Let's go through a simple example of branching and merging with a workflow that you might use in the real world.
  You'll follow these steps:
  
--. Do some work on a website.
--. Create a branch for a new user story you're working on.
-+. Do work on a web site.
-+. Create a branch for a new story you're working on.
+-. Do work on a web site.
+-. Create a branch for a new story you're working on.
++. Do some work on a website.
++. Create a branch for a new user story you're working on.
  . Do some work in that branch.
  
  At this stage, you'll receive a call that another issue is critical and you need a hotfix.
-@@ -13,306 +13,134 @@
+@@ -13,134 +13,306 @@
  . Switch to your production branch.
  . Create a branch to add the hotfix.
  . After it's tested, merge the hotfix branch, and push to production.
--. Switch back to your original user story and continue working.
-+. Switch back to your original story and continue working.
+-. Switch back to your original story and continue working.
++. Switch back to your original user story and continue working.
  
--[[_basic_branching]]
++[[_basic_branching]]
  ==== Basic Branching
  
--(((branches, basic workflow)))
--First, let's say you're working on your project and have a couple of commits already on the `master` branch.
-+First, let's say you're working on your project and have a couple of commits already.
+-First, let's say you're working on your project and have a couple of commits already.
++(((branches, basic workflow)))
++First, let's say you're working on your project and have a couple of commits already on the `master` branch.
  
  .A simple commit history
--image::images/basic-branching-1.png[A simple commit history]
-+image::images/basic-branching-1.png[A simple commit history.]
+-image::images/basic-branching-1.png[A simple commit history.]
++image::images/basic-branching-1.png[A simple commit history]
  
  You've decided that you're going to work on issue #53 in whatever issue-tracking system your company uses.
--To create a new branch and switch to it at the same time, you can run the `git checkout` command with the `-b` switch:
--
--[source,console]
------
--$ git checkout -b iss53
--Switched to a new branch "iss53"
------
-+To create a branch and switch to it at the same time, you can run the `git checkout` command with the `-b` switch:
+-To create a branch and switch to it at the same time, you can run the `git checkout` command with the `-b` switch:
++To create a new branch and switch to it at the same time, you can run the `git checkout` command with the `-b` switch:
++
++[source,console]
++----
++$ git checkout -b iss53
++Switched to a new branch "iss53"
++----
  
  This is shorthand for:
  
--[source,console]
------
--$ git branch iss53
--$ git checkout iss53
------
--
++[source,console]
++----
++$ git branch iss53
++$ git checkout iss53
++----
++
  .Creating a new branch pointer
--image::images/basic-branching-2.png[Creating a new branch pointer]
-+image::images/basic-branching-2.png[Creating a new branch pointer.]
+-image::images/basic-branching-2.png[Creating a new branch pointer.]
++image::images/basic-branching-2.png[Creating a new branch pointer]
  
--You work on your website and do some commits.
-+You work on your web site and do some commits.
+-You work on your web site and do some commits.
++You work on your website and do some commits.
  Doing so moves the `iss53` branch forward, because you have it checked out (that is, your `HEAD` is pointing to it):
  
--[source,console]
------
--$ vim index.html
--$ git commit -a -m 'Create new footer [issue 53]'
------
--
--.The `iss53` branch has moved forward with your work
--image::images/basic-branching-3.png[The `iss53` branch has moved forward with your work]
-+.The iss53 branch has moved forward with your work
-+image::images/basic-branching-3.png[The iss53 branch has moved forward with your work.]
+-.The iss53 branch has moved forward with your work
+-image::images/basic-branching-3.png[The iss53 branch has moved forward with your work.]
++[source,console]
++----
++$ vim index.html
++$ git commit -a -m 'Create new footer [issue 53]'
++----
++
++.The `iss53` branch has moved forward with your work
++image::images/basic-branching-3.png[The `iss53` branch has moved forward with your work]
  
--Now you get the call that there is an issue with the website, and you need to fix it immediately.
-+Now you get the call that there is an issue with the web site, and you need to fix it immediately.
+-Now you get the call that there is an issue with the web site, and you need to fix it immediately.
++Now you get the call that there is an issue with the website, and you need to fix it immediately.
  With Git, you don't have to deploy your fix along with the `iss53` changes you've made, and you don't have to put a lot of effort into reverting those changes before you can work on applying your fix to what is in production.
  All you have to do is switch back to your `master` branch.
  
  However, before you do that, note that if your working directory or staging area has uncommitted changes that conflict with the branch you're checking out, Git won't let you switch branches.
  It's best to have a clean working state when you switch branches.
--There are ways to get around this (namely, stashing and commit amending) that we'll cover later on, in <<ch07-git-tools#_git_stashing>>.
-+There are ways to get around this (namely, stashing and commit amending) that we'll cover later on, in <<ch07-git-tools#r_git_stashing>>.
+-There are ways to get around this (namely, stashing and commit amending) that we'll cover later on, in <<ch07-git-tools#r_git_stashing>>.
++There are ways to get around this (namely, stashing and commit amending) that we'll cover later on, in <<ch07-git-tools#_git_stashing>>.
  For now, let's assume you've committed all your changes, so you can switch back to your `master` branch:
  
--[source,console]
------
--$ git checkout master
--Switched to branch 'master'
------
--
++[source,console]
++----
++$ git checkout master
++Switched to branch 'master'
++----
++
  At this point, your project working directory is exactly the way it was before you started working on issue #53, and you can concentrate on your hotfix.
  This is an important point to remember: when you switch branches, Git resets your working directory to look like it did the last time you committed on that branch.
  It adds, removes, and modifies files automatically to make sure your working copy is what the branch looked like on your last commit to it.
  
  Next, you have a hotfix to make.
--Let's create a `hotfix` branch on which to work until it's completed:
--
--[source,console]
------
--$ git checkout -b hotfix
--Switched to a new branch 'hotfix'
--$ vim index.html
--$ git commit -a -m 'Fix broken email address'
--[hotfix 1fb7853] Fix broken email address
-- 1 file changed, 2 insertions(+)
------
-+Let's create a hotfix branch on which to work until it's completed:
+-Let's create a hotfix branch on which to work until it's completed:
++Let's create a `hotfix` branch on which to work until it's completed:
++
++[source,console]
++----
++$ git checkout -b hotfix
++Switched to a new branch 'hotfix'
++$ vim index.html
++$ git commit -a -m 'Fix broken email address'
++[hotfix 1fb7853] Fix broken email address
++ 1 file changed, 2 insertions(+)
++----
  
  .Hotfix branch based on `master`
--image::images/basic-branching-4.png[Hotfix branch based on `master`]
-+image::images/basic-branching-4.png[Hotfix branch based on `master`.]
+-image::images/basic-branching-4.png[Hotfix branch based on `master`.]
++image::images/basic-branching-4.png[Hotfix branch based on `master`]
  
--You can run your tests, make sure the hotfix is what you want, and finally merge the `hotfix` branch back into your `master` branch to deploy to production.
-+You can run your tests, make sure the hotfix is what you want, and merge it back into your `master` branch to deploy to production.
+-You can run your tests, make sure the hotfix is what you want, and merge it back into your `master` branch to deploy to production.
++You can run your tests, make sure the hotfix is what you want, and finally merge the `hotfix` branch back into your `master` branch to deploy to production.
  You do this with the `git merge` command:(((git commands, merge)))
  
--[source,console]
------
--$ git checkout master
--$ git merge hotfix
--Updating f42c576..3a0874c
--Fast-forward
-- index.html | 2 ++
-- 1 file changed, 2 insertions(+)
------
--
++[source,console]
++----
++$ git checkout master
++$ git merge hotfix
++Updating f42c576..3a0874c
++Fast-forward
++ index.html | 2 ++
++ 1 file changed, 2 insertions(+)
++----
++
  You'll notice the phrase ``fast-forward'' in that merge.
--Because the commit `C4` pointed to by the branch `hotfix` you merged in was directly ahead of the commit `C2` you're on, Git simply moves the pointer forward.
--To phrase that another way, when you try to merge one commit with a commit that can be reached by following the first commit's history, Git simplifies things by moving the pointer forward because there is no divergent work to merge together -- this is called a ``fast-forward.''
-+Because the commit pointed to by the branch you merged in was directly upstream of the commit you're on, Git simply moves the pointer forward.
-+To phrase that another way, when you try to merge one commit with a commit that can be reached by following the first commit's history, Git simplifies things by moving the pointer forward because there is no divergent work to merge together – this is called a ``fast-forward.''
+-Because the commit pointed to by the branch you merged in was directly upstream of the commit you're on, Git simply moves the pointer forward.
+-To phrase that another way, when you try to merge one commit with a commit that can be reached by following the first commit's history, Git simplifies things by moving the pointer forward because there is no divergent work to merge together – this is called a ``fast-forward.''
++Because the commit `C4` pointed to by the branch `hotfix` you merged in was directly ahead of the commit `C2` you're on, Git simply moves the pointer forward.
++To phrase that another way, when you try to merge one commit with a commit that can be reached by following the first commit's history, Git simplifies things by moving the pointer forward because there is no divergent work to merge together -- this is called a ``fast-forward.''
  
  Your change is now in the snapshot of the commit pointed to by the `master` branch, and you can deploy the fix.
  
  .`master` is fast-forwarded to `hotfix`
--image::images/basic-branching-5.png[`master` is fast-forwarded to `hotfix`]
-+image::images/basic-branching-5.png[`master` is fast-forwarded to `hotfix`.]
+-image::images/basic-branching-5.png[`master` is fast-forwarded to `hotfix`.]
++image::images/basic-branching-5.png[`master` is fast-forwarded to `hotfix`]
  
  After your super-important fix is deployed, you're ready to switch back to the work you were doing before you were interrupted.
--However, first you'll delete the `hotfix` branch, because you no longer need it -- the `master` branch points at the same place.
-+However, first you'll delete the `hotfix` branch, because you no longer need it – the `master` branch points at the same place.
+-However, first you'll delete the `hotfix` branch, because you no longer need it – the `master` branch points at the same place.
++However, first you'll delete the `hotfix` branch, because you no longer need it -- the `master` branch points at the same place.
  You can delete it with the `-d` option to `git branch`:
  
--[source,console]
------
--$ git branch -d hotfix
--Deleted branch hotfix (3a0874c).
------
--
++[source,console]
++----
++$ git branch -d hotfix
++Deleted branch hotfix (3a0874c).
++----
++
  Now you can switch back to your work-in-progress branch on issue #53 and continue working on it.
  
--[source,console]
------
--$ git checkout iss53
--Switched to branch "iss53"
--$ vim index.html
--$ git commit -a -m 'Finish the new footer [issue 53]'
--[iss53 ad82d7a] Finish the new footer [issue 53]
--1 file changed, 1 insertion(+)
------
--
++[source,console]
++----
++$ git checkout iss53
++Switched to branch "iss53"
++$ vim index.html
++$ git commit -a -m 'Finish the new footer [issue 53]'
++[iss53 ad82d7a] Finish the new footer [issue 53]
++1 file changed, 1 insertion(+)
++----
++
  .Work continues on `iss53`
--image::images/basic-branching-6.png[Work continues on `iss53`]
-+image::images/basic-branching-6.png[Work continues on `iss53`.]
+-image::images/basic-branching-6.png[Work continues on `iss53`.]
++image::images/basic-branching-6.png[Work continues on `iss53`]
  
  It's worth noting here that the work you did in your `hotfix` branch is not contained in the files in your `iss53` branch.
  If you need to pull it in, you can merge your `master` branch into your `iss53` branch by running `git merge master`, or you can wait to integrate those changes until you decide to pull the `iss53` branch back into `master` later.
  
--[[_basic_merging]]
++[[_basic_merging]]
  ==== Basic Merging
  
--(((branches, merging)))(((merging)))
++(((branches, merging)))(((merging)))
  Suppose you've decided that your issue #53 work is complete and ready to be merged into your `master` branch.
  In order to do that, you'll merge your `iss53` branch into `master`, much like you merged your `hotfix` branch earlier.
  All you have to do is check out the branch you wish to merge into and then run the `git merge` command:
  
--[source,console]
------
--$ git checkout master
--Switched to branch 'master'
--$ git merge iss53
--Merge made by the 'recursive' strategy.
--index.html |    1 +
--1 file changed, 1 insertion(+)
------
--
++[source,console]
++----
++$ git checkout master
++Switched to branch 'master'
++$ git merge iss53
++Merge made by the 'recursive' strategy.
++index.html |    1 +
++1 file changed, 1 insertion(+)
++----
++
  This looks a bit different than the `hotfix` merge you did earlier.
  In this case, your development history has diverged from some older point.
  Because the commit on the branch you're on isn't a direct ancestor of the branch you're merging in, Git has to do some work.
  In this case, Git does a simple three-way merge, using the two snapshots pointed to by the branch tips and the common ancestor of the two.
  
  .Three snapshots used in a typical merge
--image::images/basic-merging-1.png[Three snapshots used in a typical merge]
-+image::images/basic-merging-1.png[Three snapshots used in a typical merge.]
+-image::images/basic-merging-1.png[Three snapshots used in a typical merge.]
++image::images/basic-merging-1.png[Three snapshots used in a typical merge]
  
  Instead of just moving the branch pointer forward, Git creates a new snapshot that results from this three-way merge and automatically creates a new commit that points to it.
  This is referred to as a merge commit, and is special in that it has more than one parent.
  
  .A merge commit
--image::images/basic-merging-2.png[A merge commit]
-+image::images/basic-merging-2.png[A merge commit.]
- 
--Now that your work is merged in, you have no further need for the `iss53` branch.
--You can close the issue in your issue-tracking system, and delete the branch:
-+It's worth pointing out that Git determines the best common ancestor to use for its merge base; this is different than older tools like CVS or Subversion (before version 1.5), where the developer doing the merge had to figure out the best merge base for themselves.
-+This makes merging a heck of a lot easier in Git than in these other systems.
+-image::images/basic-merging-2.png[A merge commit.]
+-
+-It's worth pointing out that Git determines the best common ancestor to use for its merge base; this is different than older tools like CVS or Subversion (before version 1.5), where the developer doing the merge had to figure out the best merge base for themselves.
+-This makes merging a heck of a lot easier in Git than in these other systems.
++image::images/basic-merging-2.png[A merge commit]
  
--[source,console]
------
--$ git branch -d iss53
------
-+Now that your work is merged in, you have no further need for the `iss53` branch.
-+You can close the ticket in your ticket-tracking system, and delete the branch:
+ Now that your work is merged in, you have no further need for the `iss53` branch.
+-You can close the ticket in your ticket-tracking system, and delete the branch:
++You can close the issue in your issue-tracking system, and delete the branch:
++
++[source,console]
++----
++$ git branch -d iss53
++----
  
--[[_basic_merge_conflicts]]
++[[_basic_merge_conflicts]]
  ==== Basic Merge Conflicts
  
--(((merging, conflicts)))
++(((merging, conflicts)))
  Occasionally, this process doesn't go smoothly.
--If you changed the same part of the same file differently in the two branches you're merging, Git won't be able to merge them cleanly.
--If your fix for issue #53 modified the same part of a file as the `hotfix` branch, you'll get a merge conflict that looks something like this:
--
--[source,console]
------
--$ git merge iss53
--Auto-merging index.html
--CONFLICT (content): Merge conflict in index.html
--Automatic merge failed; fix conflicts and then commit the result.
------
-+If you changed the same part of the same file differently in the two branches you're merging together, Git won't be able to merge them cleanly.
-+If your fix for issue #53 modified the same part of a file as the `hotfix`, you'll get a merge conflict that looks something like this:
+-If you changed the same part of the same file differently in the two branches you're merging together, Git won't be able to merge them cleanly.
+-If your fix for issue #53 modified the same part of a file as the `hotfix`, you'll get a merge conflict that looks something like this:
++If you changed the same part of the same file differently in the two branches you're merging, Git won't be able to merge them cleanly.
++If your fix for issue #53 modified the same part of a file as the `hotfix` branch, you'll get a merge conflict that looks something like this:
++
++[source,console]
++----
++$ git merge iss53
++Auto-merging index.html
++CONFLICT (content): Merge conflict in index.html
++Automatic merge failed; fix conflicts and then commit the result.
++----
  
  Git hasn't automatically created a new merge commit.
  It has paused the process while you resolve the conflict.
  If you want to see which files are unmerged at any point after a merge conflict, you can run `git status`:
  
--[source,console]
------
--$ git status
--On branch master
--You have unmerged paths.
--  (fix conflicts and run "git commit")
--
--Unmerged paths:
--  (use "git add <file>..." to mark resolution)
--
--    both modified:      index.html
--
--no changes added to commit (use "git add" and/or "git commit -a")
------
--
++[source,console]
++----
++$ git status
++On branch master
++You have unmerged paths.
++  (fix conflicts and run "git commit")
++
++Unmerged paths:
++  (use "git add <file>..." to mark resolution)
++
++    both modified:      index.html
++
++no changes added to commit (use "git add" and/or "git commit -a")
++----
++
  Anything that has merge conflicts and hasn't been resolved is listed as unmerged.
  Git adds standard conflict-resolution markers to the files that have conflicts, so you can open them manually and resolve those conflicts.
  Your file contains a section that looks something like this:
  
--[source,html]
------
--<<<<<<< HEAD:index.html
--<div id="footer">contact : [e-mail]</div>
--=======
--<div id="footer">
-- please contact us at [e-mail]
--</div>
-->>>>>>> iss53:index.html
------
--
++[source,html]
++----
++<<<<<<< HEAD:index.html
++<div id="footer">contact : [e-mail]</div>
++=======
++<div id="footer">
++ please contact us at [e-mail]
++</div>
++>>>>>>> iss53:index.html
++----
++
  This means the version in `HEAD` (your `master` branch, because that was what you had checked out when you ran your merge command) is the top part of that block (everything above the `=======`), while the version in your `iss53` branch looks like everything in the bottom part.
  In order to resolve the conflict, you have to either choose one side or the other or merge the contents yourself.
  For instance, you might resolve this conflict by replacing the entire block with this:
  
--[source,html]
------
--<div id="footer">
--please contact us at [e-mail]
--</div>
------
--
--This resolution has a little of each section, and the `<<<<<<<`, `=======`, and `>>>>>>>` lines have been completely removed.
-+This resolution has a little of each section, and the `>>>>>` lines have been completely removed.
+-This resolution has a little of each section, and the `>>>>>` lines have been completely removed.
++[source,html]
++----
++<div id="footer">
++please contact us at [e-mail]
++</div>
++----
++
++This resolution has a little of each section, and the `<<<<<<<`, `=======`, and `>>>>>>>` lines have been completely removed.
  After you've resolved each of these sections in each conflicted file, run `git add` on each file to mark it as resolved.
  Staging the file marks it as resolved in Git.
  
  If you want to use a graphical tool to resolve these issues, you can run `git mergetool`, which fires up an appropriate visual merge tool and walks you through the conflicts:(((git commands, mergetool)))
  
--[source,console]
------
--$ git mergetool
--
--This message is displayed because 'merge.tool' is not configured.
--See 'git mergetool --tool-help' or 'git help config' for more details.
--'git mergetool' will now attempt to use one of the following tools:
--opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc3 codecompare vimdiff emerge
--Merging:
--index.html
--
--Normal merge conflict for 'index.html':
--  {local}: modified file
--  {remote}: modified file
--Hit return to start merge resolution tool (opendiff):
------
--
++[source,console]
++----
++$ git mergetool
++
++This message is displayed because 'merge.tool' is not configured.
++See 'git mergetool --tool-help' or 'git help config' for more details.
++'git mergetool' will now attempt to use one of the following tools:
++opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc3 codecompare vimdiff emerge
++Merging:
++index.html
++
++Normal merge conflict for 'index.html':
++  {local}: modified file
++  {remote}: modified file
++Hit return to start merge resolution tool (opendiff):
++----
++
  If you want to use a merge tool other than the default (Git chose `opendiff` in this case because the command was run on a Mac), you can see all the supported tools listed at the top after ``one of the following tools.''
  Just type the name of the tool you'd rather use.
  
--[NOTE]
++[NOTE]
  ====
--If you need more advanced tools for resolving tricky merge conflicts, we cover more on merging in <<ch07-git-tools#_advanced_merging>>.
-+If you need more advanced tools for resolving tricky merge conflicts, we cover more on merging in <<ch07-git-tools#r_advanced_merging>>.
+-If you need more advanced tools for resolving tricky merge conflicts, we cover more on merging in <<ch07-git-tools#r_advanced_merging>>.
++If you need more advanced tools for resolving tricky merge conflicts, we cover more on merging in <<ch07-git-tools#_advanced_merging>>.
  ====
  
  After you exit the merge tool, Git asks you if the merge was successful.
  If you tell the script that it was, it stages the file to mark it as resolved for you.
  You can run `git status` again to verify that all conflicts have been resolved:
  
--[source,console]
------
--$ git status
--On branch master
--All conflicts fixed but you are still merging.
--  (use "git commit" to conclude merge)
--
--Changes to be committed:
--
--    modified:   index.html
------
--
++[source,console]
++----
++$ git status
++On branch master
++All conflicts fixed but you are still merging.
++  (use "git commit" to conclude merge)
++
++Changes to be committed:
++
++    modified:   index.html
++----
++
  If you're happy with that, and you verify that everything that had conflicts has been staged, you can type `git commit` to finalize the merge commit.
  The commit message by default looks something like this:
  
--[source,console]
------
--Merge branch 'iss53'
--
--Conflicts:
--    index.html
--#
--# It looks like you may be committing a merge.
--# If this is not correct, please remove the file
--#	.git/MERGE_HEAD
--# and try again.
--
--
--# Please enter the commit message for your changes. Lines starting
--# with '#' will be ignored, and an empty message aborts the commit.
--# On branch master
--# All conflicts fixed but you are still merging.
--#
--# Changes to be committed:
--#	modified:   index.html
--#
------
--
--If you think it would be helpful to others looking at this merge in the future, you can modify this commit message with details about how you resolved the merge and explain why you did the changes you made if these are not obvious.
-+You can modify that message with details about how you resolved the merge if you think it would be helpful to others looking at this merge in the future – why you did what you did, if it's not obvious.
-diff -au ../../git/progit2/progit2/book/03-git-branching/sections/branch-management.asc /tmp/book/03-git-branching/sections/branch-management.asc.tmp
---- ../../git/progit2/progit2/book/03-git-branching/sections/branch-management.asc	2020-09-12 09:27:13.221663700 +0900
-+++ /tmp/book/03-git-branching/sections/branch-management.asc.tmp	2020-10-25 09:24:25.660966904 +0900
+-You can modify that message with details about how you resolved the merge if you think it would be helpful to others looking at this merge in the future – why you did what you did, if it's not obvious.
++[source,console]
++----
++Merge branch 'iss53'
++
++Conflicts:
++    index.html
++#
++# It looks like you may be committing a merge.
++# If this is not correct, please remove the file
++#	.git/MERGE_HEAD
++# and try again.
++
++
++# Please enter the commit message for your changes. Lines starting
++# with '#' will be ignored, and an empty message aborts the commit.
++# On branch master
++# All conflicts fixed but you are still merging.
++#
++# Changes to be committed:
++#	modified:   index.html
++#
++----
++
++If you think it would be helpful to others looking at this merge in the future, you can modify this commit message with details about how you resolved the merge and explain why you did the changes you made if these are not obvious.
+diff -au /tmp/book/03-git-branching/sections/branch-management.asc.tmp ../../git/progit2/progit2/book/03-git-branching/sections/branch-management.asc
+--- /tmp/book/03-git-branching/sections/branch-management.asc.tmp	2020-10-25 11:05:02.196636753 +0900
++++ ../../git/progit2/progit2/book/03-git-branching/sections/branch-management.asc	2020-09-12 09:27:13.221663700 +0900
 @@ -1,4 +1,4 @@
--[[_branch_management]]
-+[[r_branch_management]]
+-[[r_branch_management]]
++[[_branch_management]]
  === Branch Management
  
  (((branches, managing)))
@@ -3722,16877 +3712,16781 @@ diff -au ../../git/progit2/progit2/book/03-git-branching/sections/branch-managem
  [source,console]
  ----
  $ git branch -v
--  iss53   93b412c Fix javascript issue
-+  iss53   93b412c fix javascript issue
+-  iss53   93b412c fix javascript issue
++  iss53   93b412c Fix javascript issue
  * master  7a98805 Merge branch 'iss53'
--  testing 782fd34 Add scott to the author list in the readme
-+  testing 782fd34 add scott to the author list in the readmes
+-  testing 782fd34 add scott to the author list in the readmes
++  testing 782fd34 Add scott to the author list in the readme
  ----
  
  The useful `--merged` and `--no-merged` options can filter this list to branches that you have or have not yet merged into the branch you're currently on.
-@@ -59,126 +59,3 @@
+@@ -59,3 +59,126 @@
  ----
  
  If you really do want to delete the branch and lose that work, you can force it with `-D`, as the helpful message points out.
--
--[TIP]
--====
--The options described above, `--merged` and `--no-merged` will, if not given a commit or branch name as an argument, show you what is, respectively, merged or not merged into your _current_ branch.
--
--You can always provide an additional argument to ask about the merge state with respect to some other branch without checking  that other branch out first, as in, what is not merged into the `master` branch?
--[source,console]
------
--$ git checkout testing
--$ git branch --no-merged master
--  topicA
--  featureB
------
--====
--
--==== Changing a branch name
--
--[CAUTION]
--====
--Do not rename branches that are still in use by other collaborators.
--Do not rename a branch like master/main/mainline without having read the section "Changing the master branch name".
--====
--
--Suppose you have a branch that is called _bad-branch-name_ and you want to change it to _corrected-branch-name_, while keeping all history.
--You also want to change the branch name on the remote (GitHub, GitLab, other server).
--How do you do this?
--
--Rename the branch locally with the `git branch --move` command:
--
--[source, console]
------
--$ git branch --move bad-branch-name corrected-branch-name
------
--
--This replaces your bad-branch-name with corrected-branch-name, but this change is only local for now.
--To let others see the corrected branch on the remote, push it:
--
--[source,console]
------
--$ git push --set-upstream origin corrected-branch-name
------
--
--Now we'll take a brief look at where we are now:
--
--[source, console]
------
--$ git branch --all
--* corrected-branch-name
--  main
--  remotes/origin/bad-branch-name
--  remotes/origin/corrected-branch-name
--  remotes/origin/main
------
--
--Notice that you're on the branch corrected-branch-name.
--The corrected branch is available on the remote.
--However the bad branch is also still present on the remote.
--You can delete the bad branch from the remote:
--
--[source,console]
------
--$ git push origin --delete bad-branch-name
------
--
--Now the bad branch name is fully replaced with the corrected branch name.
--
--===== Changing the master branch name
--
--[WARNING]
--====
--Changing the name of a branch like master/main/mainline/default will break the integrations, services, helper utilities and build/release scripts that your repository uses.
--Before you do this, make sure you consult with your collaborators.
--Also make sure you do a thorough search through your repo and update any references to the old branch name in your code or scripts.
--====
--
--Rename your local _master_ branch into _main_ with the following command
--
--[source,console]
------
--$ git branch --move master main
------
--
--There's no _master_ branch locally anymore, because it's renamed to the _main_ branch.
--
--To let others see the new _main_ branch, you need to push it to the remote.
--This makes the renamed branch available on the remote.
--
--[source,console]
------
--$ git push --set-upstream origin main
------
--
--Now we end up with the following state:
--
--[source,console]
------
--git branch --all
--* main
--  remotes/origin/HEAD -> origin/master
--  remotes/origin/main
--  remotes/origin/master
------
--
--Your local _master_ branch is gone, as it's replaced with the _main_ branch.
--The _main_ branch is also available on the remote.
--But the remote still has a _master_ branch.
--Other collaborators will continue to use the _master_ branch as the base of their work, until you make some further changes.
--
--Now you have a few more tasks in front of you to complete the transition:
--
--* Any projects that depend on this one will need to update their code and/or configuration.
--* Update any test-runner configuration files.
--* Adjust build and release scripts.
--* Redirect settings on your repo host for things like the repo's default branch, merge rules, and other things that match branch names.
--* Update references to the old branch in documentation.
--* Close or merge any pull requests that target the old branch.
--
--After you've done all these tasks, and are certain the main branch performs just as the _master_ branch, you can delete the _master_ branch:
--
--[source, console]
------
--$ git push origin --delete master
------
-diff -au ../../git/progit2/progit2/book/03-git-branching/sections/nutshell.asc /tmp/book/03-git-branching/sections/nutshell.asc.tmp
---- ../../git/progit2/progit2/book/03-git-branching/sections/nutshell.asc	2020-09-26 08:56:07.950296410 +0900
-+++ /tmp/book/03-git-branching/sections/nutshell.asc.tmp	2020-10-25 09:24:25.667967234 +0900
-@@ -1,41 +1,34 @@
--[[_git_branches_overview]]
-+[[r_git_branches_overview]]
++
++[TIP]
++====
++The options described above, `--merged` and `--no-merged` will, if not given a commit or branch name as an argument, show you what is, respectively, merged or not merged into your _current_ branch.
++
++You can always provide an additional argument to ask about the merge state with respect to some other branch without checking  that other branch out first, as in, what is not merged into the `master` branch?
++[source,console]
++----
++$ git checkout testing
++$ git branch --no-merged master
++  topicA
++  featureB
++----
++====
++
++==== Changing a branch name
++
++[CAUTION]
++====
++Do not rename branches that are still in use by other collaborators.
++Do not rename a branch like master/main/mainline without having read the section "Changing the master branch name".
++====
++
++Suppose you have a branch that is called _bad-branch-name_ and you want to change it to _corrected-branch-name_, while keeping all history.
++You also want to change the branch name on the remote (GitHub, GitLab, other server).
++How do you do this?
++
++Rename the branch locally with the `git branch --move` command:
++
++[source, console]
++----
++$ git branch --move bad-branch-name corrected-branch-name
++----
++
++This replaces your bad-branch-name with corrected-branch-name, but this change is only local for now.
++To let others see the corrected branch on the remote, push it:
++
++[source,console]
++----
++$ git push --set-upstream origin corrected-branch-name
++----
++
++Now we'll take a brief look at where we are now:
++
++[source, console]
++----
++$ git branch --all
++* corrected-branch-name
++  main
++  remotes/origin/bad-branch-name
++  remotes/origin/corrected-branch-name
++  remotes/origin/main
++----
++
++Notice that you're on the branch corrected-branch-name.
++The corrected branch is available on the remote.
++However the bad branch is also still present on the remote.
++You can delete the bad branch from the remote:
++
++[source,console]
++----
++$ git push origin --delete bad-branch-name
++----
++
++Now the bad branch name is fully replaced with the corrected branch name.
++
++===== Changing the master branch name
++
++[WARNING]
++====
++Changing the name of a branch like master/main/mainline/default will break the integrations, services, helper utilities and build/release scripts that your repository uses.
++Before you do this, make sure you consult with your collaborators.
++Also make sure you do a thorough search through your repo and update any references to the old branch name in your code or scripts.
++====
++
++Rename your local _master_ branch into _main_ with the following command
++
++[source,console]
++----
++$ git branch --move master main
++----
++
++There's no _master_ branch locally anymore, because it's renamed to the _main_ branch.
++
++To let others see the new _main_ branch, you need to push it to the remote.
++This makes the renamed branch available on the remote.
++
++[source,console]
++----
++$ git push --set-upstream origin main
++----
++
++Now we end up with the following state:
++
++[source,console]
++----
++git branch --all
++* main
++  remotes/origin/HEAD -> origin/master
++  remotes/origin/main
++  remotes/origin/master
++----
++
++Your local _master_ branch is gone, as it's replaced with the _main_ branch.
++The _main_ branch is also available on the remote.
++But the remote still has a _master_ branch.
++Other collaborators will continue to use the _master_ branch as the base of their work, until you make some further changes.
++
++Now you have a few more tasks in front of you to complete the transition:
++
++* Any projects that depend on this one will need to update their code and/or configuration.
++* Update any test-runner configuration files.
++* Adjust build and release scripts.
++* Redirect settings on your repo host for things like the repo's default branch, merge rules, and other things that match branch names.
++* Update references to the old branch in documentation.
++* Close or merge any pull requests that target the old branch.
++
++After you've done all these tasks, and are certain the main branch performs just as the _master_ branch, you can delete the _master_ branch:
++
++[source, console]
++----
++$ git push origin --delete master
++----
+diff -au /tmp/book/03-git-branching/sections/nutshell.asc.tmp ../../git/progit2/progit2/book/03-git-branching/sections/nutshell.asc
+--- /tmp/book/03-git-branching/sections/nutshell.asc.tmp	2020-10-25 11:05:02.202637091 +0900
++++ ../../git/progit2/progit2/book/03-git-branching/sections/nutshell.asc	2020-09-26 08:56:07.950296410 +0900
+@@ -1,34 +1,41 @@
+-[[r_git_branches_overview]]
++[[_git_branches_overview]]
  === Branches in a Nutshell
  
  To really understand the way Git does branching, we need to take a step back and examine how Git stores its data.
  
--As you may remember from <<ch01-getting-started#what_is_git_section>>, Git doesn't store data as a series of changesets or differences, but instead as a series of _snapshots_.
-+As you may remember from <<ch01-introduction#ch01-introduction>>, Git doesn't store data as a series of changesets or differences, but instead as a series of snapshots.
+-As you may remember from <<ch01-introduction#ch01-introduction>>, Git doesn't store data as a series of changesets or differences, but instead as a series of snapshots.
++As you may remember from <<ch01-getting-started#what_is_git_section>>, Git doesn't store data as a series of changesets or differences, but instead as a series of _snapshots_.
  
  When you make a commit, Git stores a commit object that contains a pointer to the snapshot of the content you staged.
--This object also contains the author's name and email address, the message that you typed, and pointers to the commit or commits that directly came before this commit (its parent or parents): zero parents for the initial commit, one parent for a normal commit, and multiple parents for a commit that results from a merge of two or more branches.
-+This object also contains the author's name and email, the message that you typed, and pointers to the commit or commits that directly came before this commit (its parent or parents): zero parents for the initial commit, one parent for a normal commit, and multiple parents for a commit that results from a merge of two or more branches.
+-This object also contains the author's name and email, the message that you typed, and pointers to the commit or commits that directly came before this commit (its parent or parents): zero parents for the initial commit, one parent for a normal commit, and multiple parents for a commit that results from a merge of two or more branches.
++This object also contains the author's name and email address, the message that you typed, and pointers to the commit or commits that directly came before this commit (its parent or parents): zero parents for the initial commit, one parent for a normal commit, and multiple parents for a commit that results from a merge of two or more branches.
  
  To visualize this, let's assume that you have a directory containing three files, and you stage them all and commit.
--Staging the files computes a checksum for each one (the SHA-1 hash we mentioned in <<ch01-getting-started#what_is_git_section>>), stores that version of the file in the Git repository (Git refers to them as _blobs_), and adds that checksum to the staging area:
-+Staging the files checksums each one (the SHA-1 hash we mentioned in <<ch01-introduction#ch01-introduction>>), stores that version of the file in the Git repository (Git refers to them as blobs), and adds that checksum to the staging area:
+-Staging the files checksums each one (the SHA-1 hash we mentioned in <<ch01-introduction#ch01-introduction>>), stores that version of the file in the Git repository (Git refers to them as blobs), and adds that checksum to the staging area:
++Staging the files computes a checksum for each one (the SHA-1 hash we mentioned in <<ch01-getting-started#what_is_git_section>>), stores that version of the file in the Git repository (Git refers to them as _blobs_), and adds that checksum to the staging area:
  
--[source,console]
------
--$ git add README test.rb LICENSE
--$ git commit -m 'Initial commit'
------
--
--When you create the commit by running `git commit`, Git checksums each subdirectory (in this case, just the root project directory) and stores them as a tree object in the Git repository.
-+When you create the commit by running `git commit`, Git checksums each subdirectory (in this case, just the root project directory) and stores those tree objects in the Git repository.
+-When you create the commit by running `git commit`, Git checksums each subdirectory (in this case, just the root project directory) and stores those tree objects in the Git repository.
++[source,console]
++----
++$ git add README test.rb LICENSE
++$ git commit -m 'Initial commit'
++----
++
++When you create the commit by running `git commit`, Git checksums each subdirectory (in this case, just the root project directory) and stores them as a tree object in the Git repository.
  Git then creates a commit object that has the metadata and a pointer to the root project tree so it can re-create that snapshot when needed.(((git commands, commit)))
  
--Your Git repository now contains five objects: three _blobs_ (each representing the contents of one of the three files), one _tree_ that lists the contents of the directory and specifies which file names are stored as which blobs, and one _commit_ with the pointer to that root tree and all the commit metadata.
-+Your Git repository now contains five objects: one blob for the contents of each of your three files, one tree that lists the contents of the directory and specifies which file names are stored as which blobs, and one commit with the pointer to that root tree and all the commit metadata.
+-Your Git repository now contains five objects: one blob for the contents of each of your three files, one tree that lists the contents of the directory and specifies which file names are stored as which blobs, and one commit with the pointer to that root tree and all the commit metadata.
++Your Git repository now contains five objects: three _blobs_ (each representing the contents of one of the three files), one _tree_ that lists the contents of the directory and specifies which file names are stored as which blobs, and one _commit_ with the pointer to that root tree and all the commit metadata.
  
  .A commit and its tree
--image::images/commit-and-tree.png[A commit and its tree]
-+image::images/commit-and-tree.png[A commit and its tree.]
+-image::images/commit-and-tree.png[A commit and its tree.]
++image::images/commit-and-tree.png[A commit and its tree]
  
  If you make some changes and commit again, the next commit stores a pointer to the commit that came immediately before it.
  
  .Commits and their parents
--image::images/commits-and-parents.png[Commits and their parents]
-+image::images/commits-and-parents.png[Commits and their parents.]
+-image::images/commits-and-parents.png[Commits and their parents.]
++image::images/commits-and-parents.png[Commits and their parents]
  
  A branch in Git is simply a lightweight movable pointer to one of these commits.
  The default branch name in Git is `master`.
  As you start making commits, you're given a `master` branch that points to the last commit you made.
--Every time you commit, the `master` branch pointer moves forward automatically.
-+Every time you commit, it moves forward automatically.
+-Every time you commit, it moves forward automatically.
++Every time you commit, the `master` branch pointer moves forward automatically.
  
--[NOTE]
++[NOTE]
  ====
  The ``master'' branch in Git is not a special branch.(((master)))
  It is exactly like any other branch.
-@@ -43,108 +36,62 @@
+@@ -36,62 +43,108 @@
  ====
  
  .A branch and its commit history
--image::images/branch-and-history.png[A branch and its commit history]
-+image::images/branch-and-history.png[A branch and its commit history.]
+-image::images/branch-and-history.png[A branch and its commit history.]
++image::images/branch-and-history.png[A branch and its commit history]
  
--[[_create_new_branch]]
++[[_create_new_branch]]
  ==== Creating a New Branch
  
--(((branches, creating)))
--What happens when you create a new branch?
-+What happens if you create a new branch?
+-What happens if you create a new branch?
++(((branches, creating)))
++What happens when you create a new branch?
  Well, doing so creates a new pointer for you to move around.
--Let's say you want to create a new branch called `testing`.
-+Let's say you create a new branch called testing.
+-Let's say you create a new branch called testing.
++Let's say you want to create a new branch called `testing`.
  You do this with the `git branch` command:(((git commands, branch)))
  
--[source,console]
------
--$ git branch testing
------
--
++[source,console]
++----
++$ git branch testing
++----
++
  This creates a new pointer to the same commit you're currently on.
  
  .Two branches pointing into the same series of commits
--image::images/two-branches.png[Two branches pointing into the same series of commits]
-+image::images/two-branches.png[Two branches pointing into the same series of commits.]
+-image::images/two-branches.png[Two branches pointing into the same series of commits.]
++image::images/two-branches.png[Two branches pointing into the same series of commits]
  
  How does Git know what branch you're currently on?
  It keeps a special pointer called `HEAD`.
  Note that this is a lot different than the concept of `HEAD` in other VCSs you may be used to, such as Subversion or CVS.
  In Git, this is a pointer to the local branch you're currently on.
  In this case, you're still on `master`.
--The `git branch` command only _created_ a new branch -- it didn't switch to that branch.
-+The `git branch` command only _created_ a new branch – it didn't switch to that branch.
+-The `git branch` command only _created_ a new branch – it didn't switch to that branch.
++The `git branch` command only _created_ a new branch -- it didn't switch to that branch.
  
  .HEAD pointing to a branch
--image::images/head-to-master.png[HEAD pointing to a branch]
-+image::images/head-to-master.png[HEAD pointing to a branch.]
+-image::images/head-to-master.png[HEAD pointing to a branch.]
++image::images/head-to-master.png[HEAD pointing to a branch]
  
  You can easily see this by running a simple `git log` command that shows you where the branch pointers are pointing.
  This option is called `--decorate`.
  
--[source,console]
------
--$ git log --oneline --decorate
--f30ab (HEAD -> master, testing) Add feature #32 - ability to add new formats to the central interface
--34ac2 Fix bug #1328 - stack overflow under certain conditions
--98ca9 Initial commit
------
--
--You can see the `master` and `testing` branches that are right there next to the `f30ab` commit.
-+You can see the ``master'' and ``testing'' branches that are right there next to the `f30ab` commit.
+-You can see the ``master'' and ``testing'' branches that are right there next to the `f30ab` commit.
++[source,console]
++----
++$ git log --oneline --decorate
++f30ab (HEAD -> master, testing) Add feature #32 - ability to add new formats to the central interface
++34ac2 Fix bug #1328 - stack overflow under certain conditions
++98ca9 Initial commit
++----
++
++You can see the `master` and `testing` branches that are right there next to the `f30ab` commit.
  
--[[_switching_branches]]
++[[_switching_branches]]
  ==== Switching Branches
  
--(((branches, switching)))
++(((branches, switching)))
  To switch to an existing branch, you run the `git checkout` command.(((git commands, checkout)))
  Let's switch to the new `testing` branch:
  
--[source,console]
------
--$ git checkout testing
------
--
++[source,console]
++----
++$ git checkout testing
++----
++
  This moves `HEAD` to point to the `testing` branch.
  
  .HEAD points to the current branch
--image::images/head-to-testing.png[HEAD points to the current branch]
-+image::images/head-to-testing.png[HEAD points to the current branch.]
+-image::images/head-to-testing.png[HEAD points to the current branch.]
++image::images/head-to-testing.png[HEAD points to the current branch]
  
  What is the significance of that?
  Well, let's do another commit:
  
--[source,console]
------
--$ vim test.rb
--$ git commit -a -m 'made a change'
------
--
++[source,console]
++----
++$ vim test.rb
++$ git commit -a -m 'made a change'
++----
++
  .The HEAD branch moves forward when a commit is made
--image::images/advance-testing.png[The HEAD branch moves forward when a commit is made]
-+image::images/advance-testing.png[The HEAD branch moves forward when a commit is made.]
+-image::images/advance-testing.png[The HEAD branch moves forward when a commit is made.]
++image::images/advance-testing.png[The HEAD branch moves forward when a commit is made]
  
  This is interesting, because now your `testing` branch has moved forward, but your `master` branch still points to the commit you were on when you ran `git checkout` to switch branches.
  Let's switch back to the `master` branch:
  
--[source,console]
------
--$ git checkout master
------
--
--[NOTE]
--.`git log` doesn't show _all_ the branches _all_ the time
--====
--If you were to run `git log` right now, you might wonder where the "testing" branch you just created went, as it would not appear in the output.
--
--The branch hasn't disappeared; Git just doesn't know that you're interested in that branch and it is trying to show you what it thinks you're interested in.
--In other words, by default, `git log` will only show commit history below the branch you've checked out.
--
--To show commit history for the desired branch you have to explicitly specify it: `git log testing`.
--To show all of the branches, add `--all` to your `git log` command.
--====
--
++[source,console]
++----
++$ git checkout master
++----
++
++[NOTE]
++.`git log` doesn't show _all_ the branches _all_ the time
++====
++If you were to run `git log` right now, you might wonder where the "testing" branch you just created went, as it would not appear in the output.
++
++The branch hasn't disappeared; Git just doesn't know that you're interested in that branch and it is trying to show you what it thinks you're interested in.
++In other words, by default, `git log` will only show commit history below the branch you've checked out.
++
++To show commit history for the desired branch you have to explicitly specify it: `git log testing`.
++To show all of the branches, add `--all` to your `git log` command.
++====
++
  .HEAD moves when you checkout
--image::images/checkout-master.png[HEAD moves when you checkout]
-+image::images/checkout-master.png[HEAD moves when you checkout.]
+-image::images/checkout-master.png[HEAD moves when you checkout.]
++image::images/checkout-master.png[HEAD moves when you checkout]
  
  That command did two things.
  It moved the HEAD pointer back to point to the `master` branch, and it reverted the files in your working directory back to the snapshot that `master` points to.
  This also means the changes you make from this point forward will diverge from an older version of the project.
  It essentially rewinds the work you've done in your `testing` branch so you can go in a different direction.
  
--[NOTE]
++[NOTE]
  .Switching branches changes files in your working directory
  ====
  It's important to note that when you switch branches in Git, files in your working directory will change.
-@@ -154,36 +101,18 @@
+@@ -101,18 +154,36 @@
  
  Let's make a few changes and commit again:
  
--[source,console]
------
--$ vim test.rb
--$ git commit -a -m 'made other changes'
------
--
--Now your project history has diverged (see <<divergent_history>>).
-+Now your project history has diverged (see <<rdivergent_history>>).
+-Now your project history has diverged (see <<rdivergent_history>>).
++[source,console]
++----
++$ vim test.rb
++$ git commit -a -m 'made other changes'
++----
++
++Now your project history has diverged (see <<divergent_history>>).
  You created and switched to a branch, did some work on it, and then switched back to your main branch and did other work.
  Both of those changes are isolated in separate branches: you can switch back and forth between the branches and merge them together when you're ready.
  And you did all that with simple `branch`, `checkout`, and `commit` commands.
  
--[[divergent_history]]
++[[divergent_history]]
  .Divergent history
--image::images/advance-master.png[Divergent history]
-+image::images/advance-master.png[Divergent history.]
+-image::images/advance-master.png[Divergent history.]
++image::images/advance-master.png[Divergent history]
  
  You can also see this easily with the `git log` command.
  If you run `git log --oneline --decorate --graph --all` it will print out the history of your commits, showing where your branch pointers are and how your history has diverged.
  
--[source,console]
------
--$ git log --oneline --decorate --graph --all
--* c2b9e (HEAD, master) Made other changes
--| * 87ab2 (testing) Made a change
--|/
--* f30ab Add feature #32 - ability to add new formats to the central interface
--* 34ac2 Fix bug #1328 - stack overflow under certain conditions
--* 98ca9 initial commit of my project
------
--
--Because a branch in Git is actually a simple file that contains the 40 character SHA-1 checksum of the commit it points to, branches are cheap to create and destroy.
-+Because a branch in Git is in actuality a simple file that contains the 40 character SHA-1 checksum of the commit it points to, branches are cheap to create and destroy.
+-Because a branch in Git is in actuality a simple file that contains the 40 character SHA-1 checksum of the commit it points to, branches are cheap to create and destroy.
++[source,console]
++----
++$ git log --oneline --decorate --graph --all
++* c2b9e (HEAD, master) Made other changes
++| * 87ab2 (testing) Made a change
++|/
++* f30ab Add feature #32 - ability to add new formats to the central interface
++* 34ac2 Fix bug #1328 - stack overflow under certain conditions
++* 98ca9 initial commit of my project
++----
++
++Because a branch in Git is actually a simple file that contains the 40 character SHA-1 checksum of the commit it points to, branches are cheap to create and destroy.
  Creating a new branch is as quick and simple as writing 41 bytes to a file (40 characters and a newline).
  
  This is in sharp contrast to the way most older VCS tools branch, which involves copying all of the project's files into a second directory.
-@@ -192,18 +121,3 @@
+@@ -121,3 +192,18 @@
  These features help encourage developers to create and use branches often.
  
  Let's see why you should do so.
--
--[NOTE]
--.Creating a new branch and switching to it at the same time
--====
--It's typical to create a new branch and want to switch to that new branch at the same time -- this can be done in one operation with `git checkout -b <newbranchname>`.
--====
--
--[NOTE]
--====
--From Git version 2.23 onwards you can use `git switch` instead of `git checkout` to:
--
--- Switch to an existing branch: `git switch testing-branch`.
--- Create a new branch and switch to it: `git switch -c new-branch`. The `-c` flag stands for create, you can also use the full flag: `--create`.
--- Return to your previously checked out branch: `git switch -`.
--====
-diff -au ../../git/progit2/progit2/book/03-git-branching/sections/rebasing.asc /tmp/book/03-git-branching/sections/rebasing.asc.tmp
---- ../../git/progit2/progit2/book/03-git-branching/sections/rebasing.asc	2020-08-17 16:38:51.075694960 +0900
-+++ /tmp/book/03-git-branching/sections/rebasing.asc.tmp	2020-10-25 09:24:25.673967517 +0900
-@@ -1,144 +1,94 @@
--[[_rebasing]]
-+[[r_rebasing]]
++
++[NOTE]
++.Creating a new branch and switching to it at the same time
++====
++It's typical to create a new branch and want to switch to that new branch at the same time -- this can be done in one operation with `git checkout -b <newbranchname>`.
++====
++
++[NOTE]
++====
++From Git version 2.23 onwards you can use `git switch` instead of `git checkout` to:
++
++- Switch to an existing branch: `git switch testing-branch`.
++- Create a new branch and switch to it: `git switch -c new-branch`. The `-c` flag stands for create, you can also use the full flag: `--create`.
++- Return to your previously checked out branch: `git switch -`.
++====
+diff -au /tmp/book/03-git-branching/sections/rebasing.asc.tmp ../../git/progit2/progit2/book/03-git-branching/sections/rebasing.asc
+--- /tmp/book/03-git-branching/sections/rebasing.asc.tmp	2020-10-25 11:05:02.207637372 +0900
++++ ../../git/progit2/progit2/book/03-git-branching/sections/rebasing.asc	2020-08-17 16:38:51.075694960 +0900
+@@ -1,94 +1,144 @@
+-[[r_rebasing]]
++[[_rebasing]]
  === Rebasing
  
--(((rebasing)))
++(((rebasing)))
  In Git, there are two main ways to integrate changes from one branch into another: the `merge` and the `rebase`.
  In this section you'll learn what rebasing is, how to do it, why it's a pretty amazing tool, and in what cases you won't want to use it.
  
  ==== The Basic Rebase
  
--If you go back to an earlier example from <<_basic_merging>>, you can see that you diverged your work and made commits on two different branches.
-+If you go back to an earlier example from <<r_basic_merging>>, you can see that you diverged your work and made commits on two different branches.
+-If you go back to an earlier example from <<r_basic_merging>>, you can see that you diverged your work and made commits on two different branches.
++If you go back to an earlier example from <<_basic_merging>>, you can see that you diverged your work and made commits on two different branches.
  
  .Simple divergent history
--image::images/basic-rebase-1.png[Simple divergent history]
-+image::images/basic-rebase-1.png[Simple divergent history.]
+-image::images/basic-rebase-1.png[Simple divergent history.]
++image::images/basic-rebase-1.png[Simple divergent history]
  
  The easiest way to integrate the branches, as we've already covered, is the `merge` command.
  It performs a three-way merge between the two latest branch snapshots (`C3` and `C4`) and the most recent common ancestor of the two (`C2`), creating a new snapshot (and commit).
  
--[[rebasing-merging-example]]
++[[rebasing-merging-example]]
  .Merging to integrate diverged work history
--image::images/basic-rebase-2.png[Merging to integrate diverged work history]
-+image::images/basic-rebase-2.png[Merging to integrate diverged work history.]
+-image::images/basic-rebase-2.png[Merging to integrate diverged work history.]
++image::images/basic-rebase-2.png[Merging to integrate diverged work history]
  
  However, there is another way: you can take the patch of the change that was introduced in `C4` and reapply it on top of `C3`.
  In Git, this is called _rebasing_.
--With the `rebase` command, you can take all the changes that were committed on one branch and replay them on a different branch.(((git commands, rebase)))
-+With the `rebase` command, you can take all the changes that were committed on one branch and replay them on another one.(((git commands, rebase)))
+-With the `rebase` command, you can take all the changes that were committed on one branch and replay them on another one.(((git commands, rebase)))
++With the `rebase` command, you can take all the changes that were committed on one branch and replay them on a different branch.(((git commands, rebase)))
  
--For this example, you would check out the `experiment` branch, and then rebase it onto the `master` branch as follows:
-+In this example, you'd run the following:
+-In this example, you'd run the following:
++For this example, you would check out the `experiment` branch, and then rebase it onto the `master` branch as follows:
  
--[source,console]
------
--$ git checkout experiment
--$ git rebase master
--First, rewinding head to replay your work on top of it...
--Applying: added staged command
------
--
--This operation works by going to the common ancestor of the two branches (the one you're on and the one you're rebasing onto), getting the diff introduced by each commit of the branch you're on, saving those diffs to temporary files, resetting the current branch to the same commit as the branch you are rebasing onto, and finally applying each change in turn.
-+It works by going to the common ancestor of the two branches (the one you're on and the one you're rebasing onto), getting the diff introduced by each commit of the branch you're on, saving those diffs to temporary files, resetting the current branch to the same commit as the branch you are rebasing onto, and finally applying each change in turn.
+-It works by going to the common ancestor of the two branches (the one you're on and the one you're rebasing onto), getting the diff introduced by each commit of the branch you're on, saving those diffs to temporary files, resetting the current branch to the same commit as the branch you are rebasing onto, and finally applying each change in turn.
++[source,console]
++----
++$ git checkout experiment
++$ git rebase master
++First, rewinding head to replay your work on top of it...
++Applying: added staged command
++----
++
++This operation works by going to the common ancestor of the two branches (the one you're on and the one you're rebasing onto), getting the diff introduced by each commit of the branch you're on, saving those diffs to temporary files, resetting the current branch to the same commit as the branch you are rebasing onto, and finally applying each change in turn.
  
  .Rebasing the change introduced in `C4` onto `C3`
--image::images/basic-rebase-3.png[Rebasing the change introduced in `C4` onto `C3`]
-+image::images/basic-rebase-3.png[Rebasing the change introduced in `C4` onto `C3`.]
+-image::images/basic-rebase-3.png[Rebasing the change introduced in `C4` onto `C3`.]
++image::images/basic-rebase-3.png[Rebasing the change introduced in `C4` onto `C3`]
  
  At this point, you can go back to the `master` branch and do a fast-forward merge.
  
--[source,console]
------
--$ git checkout master
--$ git merge experiment
------
--
--.Fast-forwarding the `master` branch
--image::images/basic-rebase-4.png[Fast-forwarding the `master` branch]
-+.Fast-forwarding the master branch
-+image::images/basic-rebase-4.png[Fast-forwarding the master branch.]
+-.Fast-forwarding the master branch
+-image::images/basic-rebase-4.png[Fast-forwarding the master branch.]
++[source,console]
++----
++$ git checkout master
++$ git merge experiment
++----
++
++.Fast-forwarding the `master` branch
++image::images/basic-rebase-4.png[Fast-forwarding the `master` branch]
  
--Now, the snapshot pointed to by `C4'` is exactly the same as the one that was pointed to by `C5` in <<rebasing-merging-example,the merge example>>.
-+Now, the snapshot pointed to by `C4'` is exactly the same as the one that was pointed to by `C5` in the merge example.
+-Now, the snapshot pointed to by `C4'` is exactly the same as the one that was pointed to by `C5` in the merge example.
++Now, the snapshot pointed to by `C4'` is exactly the same as the one that was pointed to by `C5` in <<rebasing-merging-example,the merge example>>.
  There is no difference in the end product of the integration, but rebasing makes for a cleaner history.
  If you examine the log of a rebased branch, it looks like a linear history: it appears that all the work happened in series, even when it originally happened in parallel.
  
--Often, you'll do this to make sure your commits apply cleanly on a remote branch -- perhaps in a project to which you're trying to contribute but that you don't maintain.
-+Often, you'll do this to make sure your commits apply cleanly on a remote branch – perhaps in a project to which you're trying to contribute but that you don't maintain.
+-Often, you'll do this to make sure your commits apply cleanly on a remote branch – perhaps in a project to which you're trying to contribute but that you don't maintain.
++Often, you'll do this to make sure your commits apply cleanly on a remote branch -- perhaps in a project to which you're trying to contribute but that you don't maintain.
  In this case, you'd do your work in a branch and then rebase your work onto `origin/master` when you were ready to submit your patches to the main project.
--That way, the maintainer doesn't have to do any integration work -- just a fast-forward or a clean apply.
-+That way, the maintainer doesn't have to do any integration work – just a fast-forward or a clean apply.
+-That way, the maintainer doesn't have to do any integration work – just a fast-forward or a clean apply.
++That way, the maintainer doesn't have to do any integration work -- just a fast-forward or a clean apply.
  
--Note that the snapshot pointed to by the final commit you end up with, whether it's the last of the rebased commits for a rebase or the final merge commit after a merge, is the same snapshot -- it's only the history that is different.
-+Note that the snapshot pointed to by the final commit you end up with, whether it's the last of the rebased commits for a rebase or the final merge commit after a merge, is the same snapshot – it's only the history that is different.
+-Note that the snapshot pointed to by the final commit you end up with, whether it's the last of the rebased commits for a rebase or the final merge commit after a merge, is the same snapshot – it's only the history that is different.
++Note that the snapshot pointed to by the final commit you end up with, whether it's the last of the rebased commits for a rebase or the final merge commit after a merge, is the same snapshot -- it's only the history that is different.
  Rebasing replays changes from one line of work onto another in the order they were introduced, whereas merging takes the endpoints and merges them together.
  
  ==== More Interesting Rebases
  
  You can also have your rebase replay on something other than the rebase target branch.
--Take a history like <<rbdiag_e>>, for example.
-+Take a history like <<rrbdiag_e>>, for example.
+-Take a history like <<rrbdiag_e>>, for example.
++Take a history like <<rbdiag_e>>, for example.
  You branched a topic branch (`server`) to add some server-side functionality to your project, and made a commit.
  Then, you branched off that to make the client-side changes (`client`) and committed a few times.
  Finally, you went back to your server branch and did a few more commits.
  
--[[rbdiag_e]]
++[[rbdiag_e]]
  .A history with a topic branch off another topic branch
--image::images/interesting-rebase-1.png[A history with a topic branch off another topic branch]
-+image::images/interesting-rebase-1.png[A history with a topic branch off another topic branch.]
+-image::images/interesting-rebase-1.png[A history with a topic branch off another topic branch.]
++image::images/interesting-rebase-1.png[A history with a topic branch off another topic branch]
  
  Suppose you decide that you want to merge your client-side changes into your mainline for a release, but you want to hold off on the server-side changes until it's tested further.
--You can take the changes on `client` that aren't on `server` (`C8` and `C9`) and replay them on your `master` branch by using the `--onto` option of `git rebase`:
-+You can take the changes on client that aren't on server (`C8` and `C9`) and replay them on your `master` branch by using the `--onto` option of `git rebase`:
+-You can take the changes on client that aren't on server (`C8` and `C9`) and replay them on your `master` branch by using the `--onto` option of `git rebase`:
++You can take the changes on `client` that aren't on `server` (`C8` and `C9`) and replay them on your `master` branch by using the `--onto` option of `git rebase`:
  
--[source,console]
------
--$ git rebase --onto master server client
------
--
--This basically says, ``Take the `client` branch, figure out the patches since it diverged from the `server` branch, and replay these patches in the `client` branch as if it was based directly off the `master` branch instead.''
-+This basically says, ``Check out the client branch, figure out the patches from the common ancestor of the `client` and `server` branches, and then replay them onto `master`.''
+-This basically says, ``Check out the client branch, figure out the patches from the common ancestor of the `client` and `server` branches, and then replay them onto `master`.''
++[source,console]
++----
++$ git rebase --onto master server client
++----
++
++This basically says, ``Take the `client` branch, figure out the patches since it diverged from the `server` branch, and replay these patches in the `client` branch as if it was based directly off the `master` branch instead.''
  It's a bit complex, but the result is pretty cool.
  
  .Rebasing a topic branch off another topic branch
--image::images/interesting-rebase-2.png[Rebasing a topic branch off another topic branch]
-+image::images/interesting-rebase-2.png[Rebasing a topic branch off another topic branch.]
+-image::images/interesting-rebase-2.png[Rebasing a topic branch off another topic branch.]
++image::images/interesting-rebase-2.png[Rebasing a topic branch off another topic branch]
  
--Now you can fast-forward your `master` branch (see <<rbdiag_g>>):
-+Now you can fast-forward your `master` branch (see <<rrbdiag_g>>):
+-Now you can fast-forward your `master` branch (see <<rrbdiag_g>>):
++Now you can fast-forward your `master` branch (see <<rbdiag_g>>):
  
--[source,console]
------
--$ git checkout master
--$ git merge client
------
--
--[[rbdiag_g]]
--.Fast-forwarding your `master` branch to include the client branch changes
--image::images/interesting-rebase-3.png[Fast-forwarding your `master` branch to include the client branch changes]
-+.Fast-forwarding your master branch to include the client branch changes
-+image::images/interesting-rebase-3.png[Fast-forwarding your master branch to include the client branch changes.]
- 
- Let's say you decide to pull in your server branch as well.
--You can rebase the `server` branch onto the `master` branch without having to check it out first by running `git rebase <basebranch> <topicbranch>` -- which checks out the topic branch (in this case, `server`) for you and replays it onto the base branch (`master`):
-+You can rebase the server branch onto the `master` branch without having to check it out first by running `git rebase [basebranch] [topicbranch]` – which checks out the topic branch (in this case, `server`) for you and replays it onto the base branch (`master`):
+-.Fast-forwarding your master branch to include the client branch changes
+-image::images/interesting-rebase-3.png[Fast-forwarding your master branch to include the client branch changes.]
++[source,console]
++----
++$ git checkout master
++$ git merge client
++----
 +
-+This replays your `server` work on top of your `master` work, as shown in <<rrbdiag_h>>.
++[[rbdiag_g]]
++.Fast-forwarding your `master` branch to include the client branch changes
++image::images/interesting-rebase-3.png[Fast-forwarding your `master` branch to include the client branch changes]
  
--[source,console]
------
--$ git rebase master server
------
--
--This replays your `server` work on top of your `master` work, as shown in <<rbdiag_h>>.
+ Let's say you decide to pull in your server branch as well.
+-You can rebase the server branch onto the `master` branch without having to check it out first by running `git rebase [basebranch] [topicbranch]` – which checks out the topic branch (in this case, `server`) for you and replays it onto the base branch (`master`):
 -
--[[rbdiag_h]]
--.Rebasing your server branch on top of your `master` branch
--image::images/interesting-rebase-4.png[Rebasing your server branch on top of your `master` branch]
-+.Rebasing your server branch on top of your master branch
-+image::images/interesting-rebase-4.png[Rebasing your server branch on top of your master branch.]
+-This replays your `server` work on top of your `master` work, as shown in <<rrbdiag_h>>.
++You can rebase the `server` branch onto the `master` branch without having to check it out first by running `git rebase <basebranch> <topicbranch>` -- which checks out the topic branch (in this case, `server`) for you and replays it onto the base branch (`master`):
+ 
+-.Rebasing your server branch on top of your master branch
+-image::images/interesting-rebase-4.png[Rebasing your server branch on top of your master branch.]
++[source,console]
++----
++$ git rebase master server
++----
++
++This replays your `server` work on top of your `master` work, as shown in <<rbdiag_h>>.
++
++[[rbdiag_h]]
++.Rebasing your server branch on top of your `master` branch
++image::images/interesting-rebase-4.png[Rebasing your server branch on top of your `master` branch]
  
  Then, you can fast-forward the base branch (`master`):
  
--[source,console]
------
--$ git checkout master
--$ git merge server
------
--
--You can remove the `client` and `server` branches because all the work is integrated and you don't need them anymore, leaving your history for this entire process looking like <<rbdiag_i>>: