Commit: 153a3d3c04c069d0ef1a2e8f42fcf386710a7f15 - mytools (git)

Commit MetaInfo

• Révision: 153a3d3c04c069d0ef1a2e8f42fcf386710a7f15 (tree)
• l'heure: 2020-10-25 13:21:29
• Auteur: matsuand <30614168+matsuand@user...>
• Commiter: matsuand

Message de Log

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

Change Summary

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

Modification

--- a/progit2ja_diff/20201025.result.txt
+++ b/progit2ja_diff/20201025.result.txt
@@ -1,5 +1,5 @@
 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
+--- /tmp/A-git-in-other-environments.asc.tmp	2020-10-25 13:21:06.560922481 +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]
@@ -22,7 +22,7 @@ diff -au /tmp/A-git-in-other-environments.asc.tmp ../../git/progit2/progit2/A-gi
  
 Warning: file not found: ../../git/progit2/progit2-ja/B-embedding-git-in-your-applications.asc
 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
+--- /tmp/C-git-commands.asc.tmp	2020-10-25 13:21:06.574923226 +0900
 +++ ../../git/progit2/progit2/C-git-commands.asc	2020-08-17 16:38:51.074694961 +0900
 @@ -1,4 +1,4 @@
 -[#C-git-commands]
@@ -30,7 +30,7 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  [appendix]
  == Git Commands
  
-@@ -8,10 +8,20 @@
+@@ -8,6 +8,14 @@
  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.
  
@@ -45,29 +45,25 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  === 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 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.
-@@ -19,178 +29,251 @@
+@@ -21,24 +29,62 @@
  
  The `git config` command has been used in nearly every chapter of the book.
  
 -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 <<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 <<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#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 <<ch03-git-branching#r_rebasing>> we used it to make `--rebase` the default when you run `git pull`.
 +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#r_rebasing>> we used it to make `--rebase` the default when you run `git pull`.
+-In <<ch07-git-tools#r_credential_caching>> we used it to set up a default store for your HTTP passwords.
 +In <<ch03-git-branching#_rebasing>> we used it to make `--rebase` the default when you run `git pull`.
  
--In <<ch07-git-tools#r_credential_caching>> we used it to set up a default store for your HTTP passwords.
+-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 <<ch07-git-tools#_credential_caching>> we used it to set up a default store for your HTTP passwords.
  
--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.
+-Finally, basically the entirety of <<ch08-customizing-git#r_git_config>> is dedicated to the command.
 +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.
@@ -109,8 +105,7 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
 +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.
 +====
  
--Finally, basically the entirety of <<ch08-customizing-git#r_git_config>> is dedicated to the command.
-+==== git help
+ ==== 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>`.
@@ -121,11 +116,8 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
  === 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.
+@@ -49,13 +95,13 @@
  
-+==== 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#r_getting_a_repo>>, where we show creating a brand new repository to start working with.
@@ -139,11 +131,10 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
 -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`.
+ ==== git clone
+ 
+@@ -64,16 +110,17 @@
  
  The `git clone` command is used in dozens of places throughout the book, but we'll just list a few interesting places.
  
@@ -165,12 +156,7 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  === Basic Snapshotting
  
  For the basic workflow of staging content and committing it to your history, there are only a few basic commands.
- 
-+==== 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.
- 
+@@ -86,13 +133,13 @@
  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.
  
@@ -185,10 +171,10 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
 -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.
+ ==== git status
+ 
+@@ -100,7 +147,7 @@
  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.
  
@@ -196,34 +182,34 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
 +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
+@@ -108,36 +155,36 @@
  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#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 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 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#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>>.
++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#r_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#_advanced_merging>>.
  
 -Finally, we use it to effectively compare submodule changes with `--submodule` in <<ch07-git-tools#r_starting_submodules>>.
-+==== git difftool
++Finally, we use it to effectively compare submodule changes with `--submodule` in <<ch07-git-tools#_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#r_git_diff_staged>>.
 +We only briefly mention this in <<ch02-git-basics-chapter#_git_diff_staged>>.
-+
-+==== git commit
+ 
+ ==== 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.
  
@@ -233,32 +219,32 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
 -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.
  
 -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>>.
++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#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>>.
++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#r_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#_git_commit_objects>>.
+ 
+ ==== git reset
  
- The `git reset` command is primarily used to undo things, as you can possibly tell by the verb.
+@@ -145,34 +192,34 @@
  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#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 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.
++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#r_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#_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.
@@ -270,14 +256,14 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
 +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#r_git_mv>>.
 +We only briefly mention this command in <<ch02-git-basics-chapter#_git_mv>>.
-+
-+==== git clean
+ 
+ ==== 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.
@@ -287,24 +273,20 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
  === Branching and Merging
  
- There are just a handful of commands that implement most of the branching and merging functionality in Git.
- 
-+==== git branch
-+
- The `git branch` command is actually something of a branch management tool.
+@@ -184,47 +231,47 @@
  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#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.
  
 -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>>.
++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#r_git_refs>>.
-+==== git checkout
++Finally, we go through some of what it does in the background in <<ch10-git-internals#_git_refs>>.
+ 
+ ==== git checkout
  
  The `git checkout` command is used to switch branches and check content out into your working directory.
  
@@ -322,8 +304,8 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
 -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
+ 
+ ==== 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.
@@ -334,28 +316,26 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
 -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 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>>.
++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#r_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#_signing_commits>>.
  
 -Finally, we learned about Subtree merging in <<ch07-git-tools#r_subtree_merge>>.
-+==== git mergetool
++Finally, we learned about Subtree merging in <<ch07-git-tools#_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#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.
-@@ -198,244 +281,305 @@
+ ==== git log
+ 
+@@ -234,37 +281,38 @@
  
  This command is used in nearly every chapter of the book to demonstrate the history of a project.
  
@@ -384,15 +364,15 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
 -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
+ 
+ ==== 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#r_git_stashing>>.
 +This is basically entirely covered in <<ch07-git-tools#_git_stashing>>.
-+
-+==== git tag
+ 
+ ==== 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.
@@ -406,42 +386,39 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
  === 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.
+@@ -275,45 +323,45 @@
  
-+==== 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#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 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 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#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>>.
++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#r_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#_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#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 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>>.
++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#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>>.
++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#r_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#_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.
@@ -470,9 +447,8 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
 +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
-+
- The `git remote` command is a management tool for your record of remote repositories.
+ ==== git remote
+@@ -322,7 +370,7 @@
  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.
  
@@ -481,16 +457,16 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
  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
-+
+@@ -330,7 +378,7 @@
+ 
  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#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.
+ ==== git submodule
+ 
+@@ -338,7 +386,7 @@
  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.
  
@@ -499,8 +475,7 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
  === Inspection and Comparison
  
-+==== git show
-+
+@@ -347,25 +395,26 @@
  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.
  
@@ -512,16 +487,16 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
 -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
+ 
+ ==== 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#r_the_shortlog>>.
 +We showed how to use it to create a nice changelog in <<ch05-distributed-git#_the_shortlog>>.
-+
-+==== git describe
+ 
+ ==== 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.
@@ -532,25 +507,22 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
  === 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.
+@@ -376,20 +425,20 @@
  
-+==== 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#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
+ 
+ ==== 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#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
+ 
+ ==== 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.
  
@@ -559,35 +531,31 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
  === 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
-+
+@@ -401,27 +450,27 @@
  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#r_rebase_cherry_pick>>.
 +Cherry picking is described and demonstrated in <<ch05-distributed-git#_rebase_cherry_pick>>.
-+
-+==== git rebase
+ 
+ ==== 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#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 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 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#r_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#ref_rerere>>.
  
 -We also use it in an interactive scripting mode with the `-i` option in <<ch07-git-tools#r_changing_multiple>>.
-+==== git revert
++We also use it in an interactive scripting mode with the `-i` option in <<ch07-git-tools#_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.
@@ -597,18 +565,14 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
  === 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
-+
+@@ -433,43 +482,43 @@
  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#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
+ 
+ ==== 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.
@@ -621,29 +585,29 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
 -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
+ 
+ ==== 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#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
+ 
+ ==== 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#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
+ 
+ ==== 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#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
+ 
+ ==== 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.
@@ -653,17 +617,14 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
  === External Systems
  
- Git comes with a few commands to integrate with other version control systems.
- 
-+==== git svn
-+
+@@ -480,13 +529,13 @@
  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-scms#r_git_svn>>.
 +This command is covered in depth in <<ch09-git-and-other-systems#_git_svn>>.
-+
-+==== git fast-import
+ 
+ ==== 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.
  
@@ -672,34 +633,31 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  
  === 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
-+
+@@ -497,39 +546,40 @@
  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#r_git_gc>>.
 +We go over some examples of this in <<ch10-git-internals#_git_gc>>.
-+
-+==== git fsck
+ 
+ ==== 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#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
+ 
+ ==== 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#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>>.
  
 -We also go through a practical example of recovering such a lost branch in <<ch10-git-internals#r_data_recovery>>.
-+==== git filter-branch
++We also go through a practical example of recovering such a lost branch in <<ch10-git-internals#_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.
  
@@ -726,13 +684,13 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
  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 /tmp/LICENSE.asc.tmp ../../git/progit2/progit2/LICENSE.asc
---- /tmp/LICENSE.asc.tmp	2020-10-25 11:05:02.088630679 +0900
+--- /tmp/LICENSE.asc.tmp	2020-10-25 13:21:06.580923545 +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
+--- /tmp/README.asc.tmp	2020-10-25 13:21:06.590924077 +0900
 +++ ../../git/progit2/progit2/README.asc	2020-09-07 09:33:11.246683703 +0900
 @@ -1,51 +1,22 @@
 -= Pro Git 第2版 日本語翻訳
@@ -818,7 +776,7 @@ diff -au /tmp/README.asc.tmp ../../git/progit2/progit2/README.asc
 -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
+--- /tmp/TRANSLATION_NOTES.asc.tmp	2020-10-25 13:21:06.598924502 +0900
 +++ ../../git/progit2/progit2/TRANSLATION_NOTES.asc	2020-06-28 16:44:50.919014468 +0900
 @@ -0,0 +1,11 @@
 +== Translation Notes
@@ -833,7 +791,7 @@ diff -au /tmp/TRANSLATION_NOTES.asc.tmp ../../git/progit2/progit2/TRANSLATION_NO
 +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
+--- /tmp/book/01-introduction/sections/about-version-control.asc.tmp	2020-10-25 13:21:06.605924875 +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
@@ -912,7 +870,7 @@ diff -au /tmp/book/01-introduction/sections/about-version-control.asc.tmp ../../
  
  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 /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
+--- /tmp/book/01-introduction/sections/command-line.asc.tmp	2020-10-25 13:21:06.612925247 +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
@@ -931,7 +889,7 @@ diff -au /tmp/book/01-introduction/sections/command-line.asc.tmp ../../git/progi
 +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 /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
+--- /tmp/book/01-introduction/sections/first-time-setup.asc.tmp	2020-10-25 13:21:06.619925619 +0900
 +++ ../../git/progit2/progit2/book/01-introduction/sections/first-time-setup.asc	2020-08-10 10:02:15.168231103 +0900
 @@ -1,4 +1,4 @@
 -[[r_first_time]]
@@ -939,7 +897,7 @@ diff -au /tmp/book/01-introduction/sections/first-time-setup.asc.tmp ../../git/p
  === 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,58 +8,129 @@
+@@ -8,64 +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:
  
@@ -995,25 +953,27 @@ diff -au /tmp/book/01-introduction/sections/first-time-setup.asc.tmp ../../git/p
  
  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:
  
 -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 x86 system
 +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 x64 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:
-+
+ 
+-====
+-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.
+-====
 +[source,console]
 +----
 +$ git config --global core.editor "'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"
@@ -1021,8 +981,6 @@ diff -au /tmp/book/01-introduction/sections/first-time-setup.asc.tmp ../../git/p
  
 +[NOTE]
  ====
--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>>.
  ====
@@ -1035,6 +993,8 @@ diff -au /tmp/book/01-introduction/sections/first-time-setup.asc.tmp ../../git/p
 +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`.
@@ -1046,7 +1006,7 @@ diff -au /tmp/book/01-introduction/sections/first-time-setup.asc.tmp ../../git/p
 +----
 +$ git config --global init.defaultBranch main
 +----
-+
+ 
  ==== Checking Your Settings
  
 -If you want to check your settings, you can use the `git config --list` command to list all the settings Git can find at that point:
@@ -1088,7 +1048,7 @@ diff -au /tmp/book/01-introduction/sections/first-time-setup.asc.tmp ../../git/p
 +----
 +====
 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
+--- /tmp/book/01-introduction/sections/help.asc.tmp	2020-10-25 13:21:06.625925939 +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]]
@@ -1144,7 +1104,7 @@ diff -au /tmp/book/01-introduction/sections/help.asc.tmp ../../git/progit2/progi
 +----
 +
 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
+--- /tmp/book/01-introduction/sections/history.asc.tmp	2020-10-25 13:21:06.632926311 +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)
@@ -1153,9 +1113,9 @@ diff -au /tmp/book/01-introduction/sections/history.asc.tmp ../../git/progit2/pr
 -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
+--- /tmp/book/01-introduction/sections/installing.asc.tmp	2020-10-25 13:21:06.638926630 +0900
 +++ ../../git/progit2/progit2/book/01-introduction/sections/installing.asc	2020-07-04 16:36:46.718685392 +0900
-@@ -4,69 +4,144 @@
+@@ -4,72 +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.
  
@@ -1165,6 +1125,9 @@ diff -au /tmp/book/01-introduction/sections/installing.asc.tmp ../../git/progit2
 +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.0 should work just fine.
+-====
+-
+-====
 +Since Git is quite excellent at preserving backwards compatibility, any version after 2.8 should work just fine.
  ====
  
@@ -1175,24 +1138,24 @@ diff -au /tmp/book/01-introduction/sections/installing.asc.tmp ../../git/progit2
 +(((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're on a Debian-based distribution like Ubuntu, try apt-get:
++
 +[source,console]
 +----
 +$ sudo dnf install git-all
 +----
  
--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 like Ubuntu, try apt-get:
 +If you're on a Debian-based distribution, such as Ubuntu, try `apt`:
  
--==== Installing on Mac
+-For more options, there are instructions for installing on several different Unix flavors on the Git website, at http://git-scm.com/download/linux[].
 +[source,console]
 +----
 +$ sudo apt install git-all
 +----
  
+-==== Installing on Mac
 +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)))
@@ -1231,11 +1194,11 @@ diff -au /tmp/book/01-introduction/sections/installing.asc.tmp ../../git/progit2
 -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 for Windows.
++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.
  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)))
@@ -1253,8 +1216,7 @@ diff -au /tmp/book/01-introduction/sections/installing.asc.tmp ../../git/progit2
 -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:
- 
--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 \
@@ -1271,12 +1233,13 @@ diff -au /tmp/book/01-introduction/sections/installing.asc.tmp ../../git/progit2
 +$ sudo apt-get install asciidoc xmlto docbook2x
 +----
  
--Additionally, if you're using Fedora/RHEL/RHEL-derivatives, you need to do this
+-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):
 +[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.
 +====
-+
+ 
+-Additionally, if you're using Fedora/RHEL/RHEL-derivatives, you need to do this
 +If you're using a Debian-based distribution (Debian/Ubuntu/Ubuntu-derivatives), you also need the `install-info` package:
 +
 +[source,console]
@@ -1325,7 +1288,7 @@ diff -au /tmp/book/01-introduction/sections/installing.asc.tmp ../../git/progit2
 +----
 Warning: file not found: ../../git/progit2/progit2-ja/book/01-introduction/sections/what-is-git.asc
 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
+--- /tmp/book/02-git-basics/sections/aliases.asc.tmp	2020-10-25 13:21:06.645927003 +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]]
@@ -1402,7 +1365,7 @@ diff -au /tmp/book/02-git-basics/sections/aliases.asc.tmp ../../git/progit2/prog
 +$ 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
+--- /tmp/book/02-git-basics/sections/getting-a-repository.asc.tmp	2020-10-25 13:21:06.652927375 +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]]
@@ -1509,7 +1472,7 @@ diff -au /tmp/book/02-git-basics/sections/getting-a-repository.asc.tmp ../../git
 -<<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
+--- /tmp/book/02-git-basics/sections/recording-changes.asc.tmp	2020-10-25 13:21:06.661927854 +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
@@ -1737,7 +1700,7 @@ diff -au /tmp/book/02-git-basics/sections/recording-changes.asc.tmp ../../git/pr
  ==== 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.
-@@ -86,57 +205,198 @@
+@@ -86,60 +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:
  
@@ -1800,15 +1763,15 @@ diff -au /tmp/book/02-git-basics/sections/recording-changes.asc.tmp ../../git/pr
  ====
  
 +[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
  
@@ -1946,10 +1909,13 @@ diff -au /tmp/book/02-git-basics/sections/recording-changes.asc.tmp ../../git/pr
  .Git Diff in an External Tool
  ====
  We will continue to use the `git diff` command in various ways throughout the rest of the book.
-@@ -145,27 +405,68 @@
+@@ -148,30 +405,68 @@
  Run `git difftool --tool-help` to see what is available on your system.
  ====
  
+-====
+-====
+-
 +[[_committing_changes]]
  ==== Committing Your Changes
  
@@ -2019,7 +1985,7 @@ diff -au /tmp/book/02-git-basics/sections/recording-changes.asc.tmp ../../git/pr
  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.
  
-@@ -175,25 +476,73 @@
+@@ -181,25 +476,73 @@
  
  ==== Skipping the Staging Area
  
@@ -2095,7 +2061,7 @@ diff -au /tmp/book/02-git-basics/sections/recording-changes.asc.tmp ../../git/pr
  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.
-@@ -201,30 +550,71 @@
+@@ -207,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:
  
@@ -2171,7 +2137,7 @@ diff -au /tmp/book/02-git-basics/sections/recording-changes.asc.tmp ../../git/pr
 +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 /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
+--- /tmp/book/02-git-basics/sections/remotes.asc.tmp	2020-10-25 13:21:06.672928439 +0900
 +++ ../../git/progit2/progit2/book/02-git-basics/sections/remotes.asc	2020-07-17 09:06:42.261936072 +0900
 @@ -1,4 +1,4 @@
 -[[r_remote_repos]]
@@ -2432,7 +2398,7 @@ diff -au /tmp/book/02-git-basics/sections/remotes.asc.tmp ../../git/progit2/prog
 +
 +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
+--- /tmp/book/02-git-basics/sections/tagging.asc.tmp	2020-10-25 13:21:06.680928864 +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]]
@@ -2753,7 +2719,7 @@ diff -au /tmp/book/02-git-basics/sections/tagging.asc.tmp ../../git/progit2/prog
 -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
+--- /tmp/book/02-git-basics/sections/undoing.asc.tmp	2020-10-25 13:21:06.690929396 +0900
 +++ ../../git/progit2/progit2/book/02-git-basics/sections/undoing.asc	2020-10-18 09:42:35.779991668 +0900
 @@ -1,4 +1,4 @@
 -[[r_undoing]]
@@ -2775,7 +2741,7 @@ diff -au /tmp/book/02-git-basics/sections/undoing.asc.tmp ../../git/progit2/prog
  
  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.
-@@ -17,50 +22,214 @@
+@@ -17,56 +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:
  
@@ -2855,6 +2821,9 @@ diff -au /tmp/book/02-git-basics/sections/undoing.asc.tmp ../../git/progit2/prog
  =====
 -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.
  =====
@@ -2902,6 +2871,9 @@ diff -au /tmp/book/02-git-basics/sections/undoing.asc.tmp ../../git/progit2/prog
  It's important to understand that `git checkout -- <file>` is a dangerous command.
 -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.
  =====
@@ -3000,7 +2972,7 @@ diff -au /tmp/book/02-git-basics/sections/undoing.asc.tmp ../../git/progit2/prog
 +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
+--- /tmp/book/02-git-basics/sections/viewing-history.asc.tmp	2020-10-25 13:21:06.699929875 +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]]
@@ -3350,7 +3322,7 @@ diff -au /tmp/book/02-git-basics/sections/viewing-history.asc.tmp ../../git/prog
 +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
+--- /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp	2020-10-25 13:21:06.707930301 +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.
@@ -3363,7 +3335,7 @@ diff -au /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp
  . 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,134 +13,306 @@
+@@ -13,138 +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.
@@ -3414,11 +3386,11 @@ diff -au /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp
 +$ 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 web site, and you need to fix it immediately.
++.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.
  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.
@@ -3553,12 +3525,12 @@ diff -au /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp
  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
  
@@ -3604,7 +3576,7 @@ diff -au /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp
 +----
 +<<<<<<< HEAD:index.html
 +<div id="footer">contact : [e-mail]</div>
-+=======
+ =======
 +<div id="footer">
 + please contact us at [e-mail]
 +</div>
@@ -3652,6 +3624,9 @@ diff -au /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp
 +[NOTE]
  ====
 -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>>.
  ====
  
@@ -3700,7 +3675,7 @@ diff -au /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp
 +
 +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
+--- /tmp/book/03-git-branching/sections/branch-management.asc.tmp	2020-10-25 13:21:06.716930779 +0900
 +++ ../../git/progit2/progit2/book/03-git-branching/sections/branch-management.asc	2020-09-12 09:27:13.221663700 +0900
 @@ -1,4 +1,4 @@
 -[[r_branch_management]]
@@ -3848,9 +3823,9 @@ diff -au /tmp/book/03-git-branching/sections/branch-management.asc.tmp ../../git
 +$ 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
+--- /tmp/book/03-git-branching/sections/nutshell.asc.tmp	2020-10-25 13:21:06.725931258 +0900
 +++ ../../git/progit2/progit2/book/03-git-branching/sections/nutshell.asc	2020-09-26 08:56:07.950296410 +0900
-@@ -1,34 +1,41 @@
+@@ -1,100 +1,150 @@
 -[[r_git_branches_overview]]
 +[[_git_branches_overview]]
  === Branches in a Nutshell
@@ -3901,9 +3876,12 @@ diff -au /tmp/book/03-git-branching/sections/nutshell.asc.tmp ../../git/progit2/
  ====
  The ``master'' branch in Git is not a special branch.(((master)))
  It is exactly like any other branch.
-@@ -36,62 +43,108 @@
+ The only reason nearly every repository has one is that the `git init` command creates it by default and most people don't bother to change it.
  ====
  
+-====
+-====
+-
  .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]
@@ -4020,8 +3998,13 @@ diff -au /tmp/book/03-git-branching/sections/nutshell.asc.tmp ../../git/progit2/
  .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.
-@@ -101,18 +154,36 @@
+@@ -102,23 +152,38 @@
+ If Git cannot do it cleanly, it will not let you switch at all.
+ ====
  
+-====
+-====
+-
  Let's make a few changes and commit again:
  
 -Now your project history has diverged (see <<rdivergent_history>>).
@@ -4060,7 +4043,7 @@ diff -au /tmp/book/03-git-branching/sections/nutshell.asc.tmp ../../git/progit2/
  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.
-@@ -121,3 +192,18 @@
+@@ -127,3 +192,18 @@
  These features help encourage developers to create and use branches often.
  
  Let's see why you should do so.
@@ -4080,7 +4063,7 @@ diff -au /tmp/book/03-git-branching/sections/nutshell.asc.tmp ../../git/progit2/
 +- 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
+--- /tmp/book/03-git-branching/sections/rebasing.asc.tmp	2020-10-25 13:21:06.735931790 +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]]
@@ -4342,7 +4325,7 @@ diff -au /tmp/book/03-git-branching/sections/rebasing.asc.tmp ../../git/progit2/
 -In general the way to get the best of both worlds is to rebase local changes you've made but haven't shared yet before you push them in order to clean up your story, but never rebase anything you've pushed somewhere.
 +You can get the best of both worlds: rebase local changes before pushing to clean up your work, but never rebase anything that you've pushed somewhere.
 diff -au /tmp/book/03-git-branching/sections/remote-branches.asc.tmp ../../git/progit2/progit2/book/03-git-branching/sections/remote-branches.asc
---- /tmp/book/03-git-branching/sections/remote-branches.asc.tmp	2020-10-25 11:05:02.213637709 +0900
+--- /tmp/book/03-git-branching/sections/remote-branches.asc.tmp	2020-10-25 13:21:06.744932269 +0900
 +++ ../../git/progit2/progit2/book/03-git-branching/sections/remote-branches.asc	2020-07-04 16:36:46.723685453 +0900
 @@ -1,23 +1,25 @@
 -[[r_remote_branches]]
@@ -4376,7 +4359,14 @@ diff -au /tmp/book/03-git-branching/sections/remote-branches.asc.tmp ../../git/p
  .``origin'' is not special
  ====
  Just like the branch name ``master'' does not have any special meaning in Git, neither does ``origin''.
-@@ -29,47 +31,62 @@
+@@ -25,54 +27,66 @@
+ If you run `git clone -o booyah` instead, then you will have `booyah/master` as your default remote branch.(((origin)))
+ ====
+ 
+-====
+-====
+-
+ .Server and local repositories after cloning
  image::images/remote-branches-1.png[Server and local repositories after cloning.]
  
  If you do some work on your local `master` branch, and, in the meantime, someone else pushes to `git.ourcompany.com` and updates its `master` branch, then your histories move forward differently.
@@ -4452,11 +4442,14 @@ diff -au /tmp/book/03-git-branching/sections/remote-branches.asc.tmp ../../git/p
  .Don't type your password every time
  ====
  If you're using an HTTPS URL to push over, the Git server will ask you for your username and password for authentication.
-@@ -78,38 +95,87 @@
+@@ -81,53 +95,105 @@
  If you don't want to type it every single time you push, you can set up a ``credential cache''.
  The simplest is just to keep it in memory for a few minutes, which you can easily set up by running `git config --global credential.helper cache`.
  
 -For more information on the various credential caching options available, see <<ch07-git-tools#r_credential_caching>>.
+-====
+-
+-====
 +For more information on the various credential caching options available, see <<ch07-git-tools#_credential_caching>>.
  ====
  
@@ -4548,7 +4541,12 @@ diff -au /tmp/book/03-git-branching/sections/remote-branches.asc.tmp ../../git/p
  .Upstream shorthand
  ====
  When you have a tracking branch set up, you can reference its upstream branch with the `@{upstream}` or `@{u}` shorthand.
-@@ -119,6 +185,15 @@
+ So if you're on the `master` branch and it's tracking `origin/master`, you can say something like `git merge @{u}` instead of `git merge origin/master` if you wish.(((+++@{u}+++)))(((+++@{upstream}+++)))
+ ====
+ 
+-====
+-====
+-
  If you want to see what tracking branches you have set up, you can use the `-vv` option to `git branch`.
  This will list out your local branches with more information including what each branch is tracking and if your local branch is ahead, behind or both.
  
@@ -4564,7 +4562,7 @@ diff -au /tmp/book/03-git-branching/sections/remote-branches.asc.tmp ../../git/p
  So here we can see that our `iss53` branch is tracking `origin/iss53` and is ``ahead'' by two, meaning that we have two commits locally that are not pushed to the server.
  We can also see that our `master` branch is tracking `origin/master` and is up to date.
  Next we can see that our `serverfix` branch is tracking the `server-fix-good` branch on our `teamone` server and is ahead by three and behind by one, meaning that there is one commit on the server we haven't merged in yet and three commits locally that we haven't pushed.
-@@ -127,22 +202,37 @@
+@@ -136,22 +202,37 @@
  It's important to note that these numbers are only since the last time you fetched from each server.
  This command does not reach out to the servers, it's telling you about what it has cached from these servers locally.
  If you want totally up to date ahead and behind numbers, you'll need to fetch from all your remotes right before running this.
@@ -4606,7 +4604,7 @@ diff -au /tmp/book/03-git-branching/sections/remote-branches.asc.tmp ../../git/p
  Basically all this does is remove the pointer from the server.
  The Git server will generally keep the data there for a while until a garbage collection runs, so if it was accidentally deleted, it's often easy to recover.
 diff -au /tmp/book/03-git-branching/sections/workflows.asc.tmp ../../git/progit2/progit2/book/03-git-branching/sections/workflows.asc
---- /tmp/book/03-git-branching/sections/workflows.asc.tmp	2020-10-25 11:05:02.218637990 +0900
+--- /tmp/book/03-git-branching/sections/workflows.asc.tmp	2020-10-25 13:21:06.753932747 +0900
 +++ ../../git/progit2/progit2/book/03-git-branching/sections/workflows.asc	2020-07-04 16:36:46.723685453 +0900
 @@ -1,35 +1,39 @@
  === Branching Workflows
@@ -4682,7 +4680,7 @@ diff -au /tmp/book/03-git-branching/sections/workflows.asc.tmp ../../git/progit2
 -When you're branching and merging, everything is being done only in your Git repository – no server communication is happening.
 +When you're branching and merging, everything is being done only in your Git repository -- there is no communication with the server.
 diff -au /tmp/book/04-git-server/sections/generating-ssh-key.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/generating-ssh-key.asc
---- /tmp/book/04-git-server/sections/generating-ssh-key.asc.tmp	2020-10-25 11:05:02.223638272 +0900
+--- /tmp/book/04-git-server/sections/generating-ssh-key.asc.tmp	2020-10-25 13:21:06.760933120 +0900
 +++ ../../git/progit2/progit2/book/04-git-server/sections/generating-ssh-key.asc	2020-08-05 13:56:11.288918669 +0900
 @@ -1,21 +1,57 @@
 -[[r_generate_ssh_key]]
@@ -4748,7 +4746,7 @@ diff -au /tmp/book/04-git-server/sections/generating-ssh-key.asc.tmp ../../git/p
 +
 +For a more in-depth tutorial on creating an SSH key on multiple operating systems, see the GitHub guide on SSH keys at https://docs.github.com/en/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent[].
 diff -au /tmp/book/04-git-server/sections/git-daemon.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/git-daemon.asc
---- /tmp/book/04-git-server/sections/git-daemon.asc.tmp	2020-10-25 11:05:02.227638497 +0900
+--- /tmp/book/04-git-server/sections/git-daemon.asc.tmp	2020-10-25 13:21:06.770933652 +0900
 +++ ../../git/progit2/progit2/book/04-git-server/sections/git-daemon.asc	2020-06-28 16:44:50.925015352 +0900
 @@ -1,33 +1,66 @@
  === Git Daemon
@@ -4831,9 +4829,9 @@ diff -au /tmp/book/04-git-server/sections/git-daemon.asc.tmp ../../git/progit2/p
 +
  The presence of that file tells Git that it's OK to serve this project without authentication.
 diff -au /tmp/book/04-git-server/sections/git-on-a-server.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/git-on-a-server.asc
---- /tmp/book/04-git-server/sections/git-on-a-server.asc.tmp	2020-10-25 11:05:02.232638778 +0900
+--- /tmp/book/04-git-server/sections/git-on-a-server.asc.tmp	2020-10-25 13:21:06.778934077 +0900
 +++ ../../git/progit2/progit2/book/04-git-server/sections/git-on-a-server.asc	2020-07-04 16:36:46.723685453 +0900
-@@ -1,42 +1,74 @@
+@@ -1,45 +1,74 @@
 -[[r_git_on_the_server]]
 +[[_getting_git_on_a_server]]
  === Getting Git on a Server
@@ -4847,6 +4845,9 @@ diff -au /tmp/book/04-git-server/sections/git-on-a-server.asc.tmp ../../git/prog
  Actually setting up a production server within your infrastructure will certainly entail differences in security measures or operating system tools, but hopefully this will give you the general idea of what's involved.
  ====
  
+-====
+-====
+-
 -In order to initially set up any Git server, you have to export an existing repository into a new bare repository – a repository that doesn't contain a working directory.
 +In order to initially set up any Git server, you have to export an existing repository into a new bare repository -- a repository that doesn't contain a working directory.
  This is generally straightforward to do.
@@ -4865,13 +4866,13 @@ diff -au /tmp/book/04-git-server/sections/git-on-a-server.asc.tmp ../../git/prog
  
 -This is roughly equivalent to something like
 +This is roughly equivalent to something like:
-+
+ 
+-There are a couple of minor differences in the configuration file; but for your purpose, this is close to the same thing.
 +[source,console]
 +----
 +$ cp -Rf my_project/.git my_project.git
 +----
- 
--There are a couple of minor differences in the configuration file; but for your purpose, this is close to the same thing.
++
 +There are a couple of minor differences in the configuration file but, for your purpose, this is close to the same thing.
  It takes the Git repository by itself, without a working directory, and creates a directory specifically for it alone.
  
@@ -4923,7 +4924,7 @@ diff -au /tmp/book/04-git-server/sections/git-on-a-server.asc.tmp ../../git/prog
  
  In the next few sections, you'll see how to expand to more sophisticated setups.
  This discussion will include not having to create user accounts for each user, adding public read access to repositories, setting up web UIs and more.
-@@ -46,23 +78,24 @@
+@@ -49,23 +78,24 @@
  
  If you're a small outfit or are just trying out Git in your organization and have only a few developers, things can be simple for you.
  One of the most complicated aspects of setting up a Git server is user management.
@@ -4956,7 +4957,7 @@ diff -au /tmp/book/04-git-server/sections/git-on-a-server.asc.tmp ../../git/prog
  Another way to do it is to have your SSH server authenticate from an LDAP server or some other centralized authentication source that you may already have set up.
  As long as each user can get shell access on the machine, any SSH authentication mechanism you can think of should work.
 diff -au /tmp/book/04-git-server/sections/gitlab.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/gitlab.asc
---- /tmp/book/04-git-server/sections/gitlab.asc.tmp	2020-10-25 11:05:02.237639059 +0900
+--- /tmp/book/04-git-server/sections/gitlab.asc.tmp	2020-10-25 13:21:06.787934556 +0900
 +++ ../../git/progit2/progit2/book/04-git-server/sections/gitlab.asc	2020-09-07 09:33:11.247683703 +0900
 @@ -2,60 +2,63 @@
  
@@ -5134,7 +5135,7 @@ diff -au /tmp/book/04-git-server/sections/gitlab.asc.tmp ../../git/progit2/progi
 -One benefit to GitLab is that, once the server is set up and running, you'll rarely need to tweak a configuration file or access the server via SSH; most administration and general usage can be accomplished through the in-browser interface.
 +One benefit to GitLab is that, once the server is set up and running, you'll rarely need to tweak a configuration file or access the server via SSH; most administration and general usage can be done through the in-browser interface.
 diff -au /tmp/book/04-git-server/sections/gitweb.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/gitweb.asc
---- /tmp/book/04-git-server/sections/gitweb.asc.tmp	2020-10-25 11:05:02.242639340 +0900
+--- /tmp/book/04-git-server/sections/gitweb.asc.tmp	2020-10-25 13:21:06.793934875 +0900
 +++ ../../git/progit2/progit2/book/04-git-server/sections/gitweb.asc	2020-07-04 16:36:46.723685453 +0900
 @@ -4,25 +4,67 @@
  Now that you have basic read/write and read-only access to your project, you may want to set up a simple web-based visualizer.
@@ -5209,7 +5210,7 @@ diff -au /tmp/book/04-git-server/sections/gitweb.asc.tmp ../../git/progit2/progi
  Again, GitWeb can be served with any CGI or Perl capable web server; if you prefer to use something else, it shouldn't be difficult to set up.
  At this point, you should be able to visit `http://gitserver/` to view your repositories online.
 diff -au /tmp/book/04-git-server/sections/hosted.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/hosted.asc
---- /tmp/book/04-git-server/sections/hosted.asc.tmp	2020-10-25 11:05:02.246639565 +0900
+--- /tmp/book/04-git-server/sections/hosted.asc.tmp	2020-10-25 13:21:06.800935248 +0900
 +++ ../../git/progit2/progit2/book/04-git-server/sections/hosted.asc	2020-07-04 16:36:46.725685477 +0900
 @@ -5,6 +5,6 @@
  Even if you set up and run your own server internally, you may still want to use a public hosting site for your open source code – it's generally easier for the open source community to find and help you with.
@@ -5220,7 +5221,7 @@ diff -au /tmp/book/04-git-server/sections/hosted.asc.tmp ../../git/progit2/progi
  
  We'll cover using GitHub in detail in <<ch06-github#ch06-github>>, as it is the largest Git host out there and you may need to interact with projects hosted on it in any case, but there are dozens more to choose from should you not want to set up your own Git server.
 diff -au /tmp/book/04-git-server/sections/protocols.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/protocols.asc
---- /tmp/book/04-git-server/sections/protocols.asc.tmp	2020-10-25 11:05:02.252639902 +0900
+--- /tmp/book/04-git-server/sections/protocols.asc.tmp	2020-10-25 13:21:06.808935673 +0900
 +++ ../../git/progit2/progit2/book/04-git-server/sections/protocols.asc	2020-07-04 16:36:46.726685489 +0900
 @@ -1,39 +1,55 @@
  === The Protocols
@@ -5287,7 +5288,7 @@ diff -au /tmp/book/04-git-server/sections/protocols.asc.tmp ../../git/progit2/pr
  
  ===== The Cons
  
-@@ -45,39 +61,59 @@
+@@ -45,43 +61,59 @@
  A repository on NFS is often slower than the repository over SSH on the same server, allowing Git to run off local disks on each system.
  
  Finally, this protocol does not protect the repository against accidental damage.
@@ -5308,9 +5309,9 @@ diff -au /tmp/book/04-git-server/sections/protocols.asc.tmp ../../git/progit2/pr
 +The newer version is often referred to as the _Smart_ HTTP protocol and the older way as _Dumb_ HTTP.
 +We'll cover the newer Smart HTTP protocol first.
  
+ ===== Smart HTTP
+ 
 -The ``smart'' HTTP protocol operates very similarly to the SSH or Git protocols but runs over standard HTTP/S ports and can use various HTTP authentication mechanisms, meaning it's often easier on the user than something like SSH, since you can use things like username/password basic authentication rather than having to set up SSH keys.
-+===== Smart HTTP
-+
 +(((protocols, smart HTTP)))
 +Smart HTTP operates very similarly to the SSH or Git protocols but runs over standard HTTPS ports and can use various HTTP authentication mechanisms, meaning it's often easier on the user than something like SSH, since you can use things like username/password authentication rather than having to set up SSH keys.
  
@@ -5321,8 +5322,8 @@ diff -au /tmp/book/04-git-server/sections/protocols.asc.tmp ../../git/progit2/pr
  
 -In fact, for services like GitHub, the URL you use to view the repository online (for example, ``https://github.com/schacon/simplegit[]'') is the same URL you can use to clone and, if you have access, push over.
 +In fact, for services like GitHub, the URL you use to view the repository online (for example, https://github.com/schacon/simplegit[]) is the same URL you can use to clone and, if you have access, push over.
-+
-+===== Dumb HTTP
+ 
+ ===== Dumb HTTP
  
 -If the server does not respond with a Git HTTP smart service, the Git client will try to fall back to the simpler ``dumb'' HTTP protocol.
 +(((protocols, dumb HTTP)))
@@ -5348,20 +5349,20 @@ diff -au /tmp/book/04-git-server/sections/protocols.asc.tmp ../../git/progit2/pr
  The `post-update` hook that comes with Git by default runs the appropriate command (`git update-server-info`) to make HTTP fetching and cloning work properly.
 -This command is run when you push to this repository (over SSH perhaps); then, other people can clone via something like
 +This command is run when you push to this repository (over SSH perhaps); then, other people can clone via something like:
-+
+ 
+-In this particular case, we're using the `/var/www/htdocs` path that is common for Apache setups, but you can use any static web server – just put the bare repository in its path.
+-The Git data is served as basic static files (see <<ch10-git-internals#ch10-git-internals>> for details about exactly how it's served).
 +[source,console]
 +----
 +$ git clone https://example.com/gitproject.git
 +----
- 
--In this particular case, we're using the `/var/www/htdocs` path that is common for Apache setups, but you can use any static web server – just put the bare repository in its path.
--The Git data is served as basic static files (see <<ch10-git-internals#ch10-git-internals>> for details about exactly how it's served).
++
 +In this particular case, we're using the `/var/www/htdocs` path that is common for Apache setups, but you can use any static web server -- just put the bare repository in its path.
 +The Git data is served as basic static files (see the <<ch10-git-internals#ch10-git-internals>> chapter for details about exactly how it's served).
  
  Generally you would either choose to run a read/write Smart HTTP server or simply have the files accessible as read-only in the Dumb manner.
  It's rare to run a mix of the two services.
-@@ -93,57 +129,69 @@
+@@ -97,57 +129,69 @@
  
  You can also serve your repositories read-only over HTTPS, which means you can encrypt the content transfer; or you can go so far as to make the clients use specific signed SSL certificates.
  
@@ -5389,10 +5390,10 @@ diff -au /tmp/book/04-git-server/sections/protocols.asc.tmp ../../git/progit2/pr
 -SSH is also an authenticated network protocol; and because it's ubiquitous, it's generally easy to set up and use.
 +This is because SSH access to servers is already set up in most places -- and if it isn't, it's easy to do.
 +SSH is also an authenticated network protocol and, because it's ubiquitous, it's generally easy to set up and use.
++
++To clone a Git repository over SSH, you can specify an `ssh://` URL like this:
  
 -To clone a Git repository over SSH, you can specify ssh:// URL like this:
-+To clone a Git repository over SSH, you can specify an `ssh://` URL like this:
-+
 +[source,console]
 +----
 +$ git clone ssh://[user@]server/project.git
@@ -5451,7 +5452,7 @@ diff -au /tmp/book/04-git-server/sections/protocols.asc.tmp ../../git/progit2/pr
  It uses the same data-transfer mechanism as the SSH protocol but without the encryption and authentication overhead.
  
  ===== The Cons
-@@ -152,6 +200,6 @@
+@@ -156,6 +200,6 @@
  It's generally undesirable for the Git protocol to be the only access to your project.
  Generally, you'll pair it with SSH or HTTPS access for the few developers who have push (write) access and have everyone else use `git://` for read-only access.
  It's also probably the most difficult protocol to set up.
@@ -5460,7 +5461,7 @@ diff -au /tmp/book/04-git-server/sections/protocols.asc.tmp ../../git/progit2/pr
  It also requires firewall access to port 9418, which isn't a standard port that corporate firewalls always allow.
  Behind big corporate firewalls, this obscure port is commonly blocked.
 diff -au /tmp/book/04-git-server/sections/setting-up-server.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/setting-up-server.asc
---- /tmp/book/04-git-server/sections/setting-up-server.asc.tmp	2020-10-25 11:05:02.256640128 +0900
+--- /tmp/book/04-git-server/sections/setting-up-server.asc.tmp	2020-10-25 13:21:06.817936152 +0900
 +++ ../../git/progit2/progit2/book/04-git-server/sections/setting-up-server.asc	2020-06-28 16:44:50.927015646 +0900
 @@ -1,41 +1,148 @@
 -[[r_setting_up_server]]
@@ -5622,7 +5623,7 @@ diff -au /tmp/book/04-git-server/sections/setting-up-server.asc.tmp ../../git/pr
  As the output states, you can also set up a directory in the `git` user's home directory that customizes the `git-shell` command a bit.
  For instance, you can restrict the Git commands that the server will accept or you can customize the message that users see if they try to SSH in like that.
 diff -au /tmp/book/04-git-server/sections/smart-http.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/smart-http.asc
---- /tmp/book/04-git-server/sections/smart-http.asc.tmp	2020-10-25 11:05:02.261640409 +0900
+--- /tmp/book/04-git-server/sections/smart-http.asc.tmp	2020-10-25 13:21:06.825936578 +0900
 +++ ../../git/progit2/progit2/book/04-git-server/sections/smart-http.asc	2020-06-28 16:44:50.927015646 +0900
 @@ -1,28 +1,62 @@
  === Smart HTTP
@@ -5702,7 +5703,7 @@ diff -au /tmp/book/04-git-server/sections/smart-http.asc.tmp ../../git/progit2/p
 +For more information on configuring authentication in Apache, check out the Apache docs here: https://httpd.apache.org/docs/current/howto/auth.html[]
  ====
 diff -au /tmp/book/05-distributed-git/sections/contributing.asc.tmp ../../git/progit2/progit2/book/05-distributed-git/sections/contributing.asc
---- /tmp/book/05-distributed-git/sections/contributing.asc.tmp	2020-10-25 11:05:02.269640859 +0900
+--- /tmp/book/05-distributed-git/sections/contributing.asc.tmp	2020-10-25 13:21:06.837937216 +0900
 +++ ../../git/progit2/progit2/book/05-distributed-git/sections/contributing.asc	2020-08-29 09:58:24.050195768 +0900
 @@ -1,11 +1,12 @@
 -[[r_contributing_project]]
@@ -6153,7 +6154,7 @@ diff -au /tmp/book/05-distributed-git/sections/contributing.asc.tmp ../../git/pr
  ----
  # Jessica's Machine
  $ git fetch origin
-@@ -269,120 +374,254 @@
+@@ -269,123 +374,254 @@
  
  Now, Jessica makes a couple of commits on the `featureB` branch:
  
@@ -6315,6 +6316,9 @@ diff -au /tmp/book/05-distributed-git/sections/contributing.asc.tmp ../../git/pr
  First, you'll probably want to clone the main repository, create a topic branch for the patch or patch series you're planning to contribute, and do your work there.
  The sequence looks basically like this:
  
+-====
+-You may want to use `rebase -i` to squash your work down to a single commit, or rearrange the work in the commits to make the patch easier for the maintainer to review – see <<ch07-git-tools#r_rewriting_history>> for more information about interactive rebasing.
+-====
 +[source,console]
 +----
 +$ git clone <url>
@@ -6325,10 +6329,9 @@ diff -au /tmp/book/05-distributed-git/sections/contributing.asc.tmp ../../git/pr
 +  ... work ...
 +$ git commit
 +----
-+
+ 
 +[NOTE]
  ====
--You may want to use `rebase -i` to squash your work down to a single commit, or rearrange the work in the commits to make the patch easier for the maintainer to review – see <<ch07-git-tools#r_rewriting_history>> for more information about interactive rebasing.
 +You may want to use `rebase -i` to squash your work down to a single commit, or rearrange the work in the commits to make the patch easier for the maintainer to review -- see <<ch07-git-tools#_rewriting_history>> for more information about interactive rebasing.
  ====
  
@@ -6347,11 +6350,7 @@ diff -au /tmp/book/05-distributed-git/sections/contributing.asc.tmp ../../git/pr
 +If the maintainers `merge`, `rebase`, or `cherry-pick` your work, you'll eventually get it back via pulling from their repository anyhow.
 +
 +In any event, you can push your work with:
- 
--Then you need to push your work up to it.
--It's easiest to push the topic branch you're working on up to your repository, rather than merging into your master branch and pushing that up.
--The reason is that if the work isn't accepted or is cherry picked, you don't have to rewind your master branch.
--If the maintainers merge, rebase, or cherry-pick your work, you'll eventually get it back via pulling from their repository anyhow:
++
 +[source,console]
 +----
 +$ git push -u myfork featureA
@@ -6370,24 +6369,28 @@ diff -au /tmp/book/05-distributed-git/sections/contributing.asc.tmp ../../git/pr
 +The following changes since commit 1edee6b1d61823a2de3b09c160d7080b8d1b3a40:
 +Jessica Smith (1):
 +        Create new function
- 
--When your work has been pushed up to your fork, you need to notify the maintainer.
--This is often called a pull request, and you can either generate it via the website – GitHub has its own Pull Request mechanism that we'll go over in <<ch06-github#ch06-github>> – or you can run the `git request-pull` command and email the output to the project maintainer manually.
++
 +are available in the git repository at:
  
--The `request-pull` command takes the base branch into which you want your topic branch pulled and the Git repository URL you want them to pull from, and outputs a summary of all the changes you're asking to be pulled in.
--For instance, if Jessica wants to send John a pull request, and she's done two commits on the topic branch she just pushed up, she can run this:
+-Then you need to push your work up to it.
+-It's easiest to push the topic branch you're working on up to your repository, rather than merging into your master branch and pushing that up.
+-The reason is that if the work isn't accepted or is cherry picked, you don't have to rewind your master branch.
+-If the maintainers merge, rebase, or cherry-pick your work, you'll eventually get it back via pulling from their repository anyhow:
 +  git://githost/simplegit.git featureA
  
--The output can be sent to the maintainer – it tells them where the work was branched from, summarizes the commits, and tells where to pull this work from.
+-When your work has been pushed up to your fork, you need to notify the maintainer.
+-This is often called a pull request, and you can either generate it via the website – GitHub has its own Pull Request mechanism that we'll go over in <<ch06-github#ch06-github>> – or you can run the `git request-pull` command and email the output to the project maintainer manually.
 +Jessica Smith (2):
 +      Add limit to log function
 +      Increase log output to 30 from 25
-+
+ 
+-The `request-pull` command takes the base branch into which you want your topic branch pulled and the Git repository URL you want them to pull from, and outputs a summary of all the changes you're asking to be pulled in.
+-For instance, if Jessica wants to send John a pull request, and she's done two commits on the topic branch she just pushed up, she can run this:
 + lib/simplegit.rb |   10 +++++++++-
 + 1 files changed, 9 insertions(+), 1 deletions(-)
 +----
-+
+ 
+-The output can be sent to the maintainer – it tells them where the work was branched from, summarizes the commits, and tells where to pull this work from.
 +This output can be sent to the maintainer -- it tells them where the work was branched from, summarizes the commits, and identifies from where the new work is to be pulled.
  
  On a project for which you're not the maintainer, it's generally easier to have a branch like `master` always track `origin/master` and to do your work in topic branches that you can easily discard if they're rejected.
@@ -6426,11 +6429,11 @@ diff -au /tmp/book/05-distributed-git/sections/contributing.asc.tmp ../../git/pr
 +$ git rebase origin/master
 +$ git push -f myfork featureA
 +----
++
++This rewrites your history to now look like <<psp_b>>.
  
 -.Commit history after `featureA` work.
 -image::images/public-small-2.png[Commit history after `featureA` work.]
-+This rewrites your history to now look like <<psp_b>>.
-+
 +[[psp_b]]
 +.Commit history after `featureA` work
 +image::images/public-small-2.png[Commit history after `featureA` work]
@@ -6453,7 +6456,7 @@ diff -au /tmp/book/05-distributed-git/sections/contributing.asc.tmp ../../git/pr
  $ git commit
  $ git push myfork featureBv2
  ----
-@@ -391,61 +630,173 @@
+@@ -394,61 +630,173 @@
  This means your future commit will have one parent only and allows you to introduce all the changes from another branch and then make more changes before recording the new commit.
  Also the `--no-commit` option can be useful to delay the merge commit in case of the default merge process.
  
@@ -6638,7 +6641,7 @@ diff -au /tmp/book/05-distributed-git/sections/contributing.asc.tmp ../../git/pr
  Next, you'll see how to work the other side of the coin: maintaining a Git project.
  You'll learn how to be a benevolent dictator or integration manager.
 diff -au /tmp/book/05-distributed-git/sections/distributed-workflows.asc.tmp ../../git/progit2/progit2/book/05-distributed-git/sections/distributed-workflows.asc
---- /tmp/book/05-distributed-git/sections/distributed-workflows.asc.tmp	2020-10-25 11:05:02.275641196 +0900
+--- /tmp/book/05-distributed-git/sections/distributed-workflows.asc.tmp	2020-10-25 13:21:06.846937695 +0900
 +++ ../../git/progit2/progit2/book/05-distributed-git/sections/distributed-workflows.asc	2020-07-04 16:36:46.728685513 +0900
 @@ -1,19 +1,21 @@
  === Distributed Workflows
@@ -6761,7 +6764,7 @@ diff -au /tmp/book/05-distributed-git/sections/distributed-workflows.asc.tmp ../
  
  These are some commonly used workflows that are possible with a distributed system like Git, but you can see that many variations are possible to suit your particular real-world workflow.
 diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/progit2/progit2/book/05-distributed-git/sections/maintaining.asc
---- /tmp/book/05-distributed-git/sections/maintaining.asc.tmp	2020-10-25 11:05:02.282641590 +0900
+--- /tmp/book/05-distributed-git/sections/maintaining.asc.tmp	2020-10-25 13:21:06.856938227 +0900
 +++ ../../git/progit2/progit2/book/05-distributed-git/sections/maintaining.asc	2020-07-07 09:30:48.190756402 +0900
 @@ -1,64 +1,122 @@
  === Maintaining a Project
@@ -7048,7 +7051,7 @@ diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/pro
  This command gives you a diff, but it may be misleading.
  If your `master` branch has moved forward since you created the topic branch from it, then you'll get seemingly strange results.
  This happens because Git directly compares the snapshots of the last commit of the topic branch you're on and the snapshot of the last commit on the `master` branch.
-@@ -131,165 +263,294 @@
+@@ -131,167 +263,294 @@
  
  If `master` is a direct ancestor of your topic branch, this isn't a problem; but if the two histories have diverged, the diff will look like you're adding all the new stuff in your topic branch and removing everything unique to the `master` branch.
  
@@ -7067,8 +7070,7 @@ diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/pro
 +36c7dba2c95e6bbb78dfa822519ecfec6e1ca649
 +$ git diff 36c7db
 +----
- 
--This command shows you only the work your current topic branch has introduced since its common ancestor with master.
++
 +or, more concisely:
 +
 +[source,console]
@@ -7078,7 +7080,8 @@ diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/pro
 +
 +However, neither of those is particularly convenient, so Git provides another shorthand for doing the same thing: the triple-dot syntax.
 +In the context of the `git diff` command, you can put three periods after another branch to do a `diff` between the last commit of the branch you're on and its common ancestor with another branch:
-+
+ 
+-This command shows you only the work your current topic branch has introduced since its common ancestor with master.
 +[source,console]
 +----
 +$ git diff master...contrib
@@ -7103,17 +7106,17 @@ diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/pro
 -When you have work in a topic branch that you've done or that someone has contributed and you've verified, you merge it into your master branch, delete the topic branch, and then continue the process.
 -If we have a repository with work in two branches named `ruby_client` and `php_client` that looks like <<rmerwf_a>> and merge `ruby_client` first and then `php_client` next, then your history will end up looking like <<rmerwf_b>>.
 +When you have work in a topic branch that you think you've completed, or work that someone else has contributed and you've verified, you merge it into your master branch, delete that just-merged topic branch, and repeat.
-+
-+For instance, if we have a repository with work in two branches named `ruby_client` and `php_client` that looks like <<merwf_a>>, and we merge `ruby_client` followed by `php_client`, your history will end up looking like <<merwf_b>>.
  
 -.History with several topic branches.
 -image::images/merging-workflows-1.png[History with several topic branches.]
-+[[merwf_a]]
-+.History with several topic branches
-+image::images/merging-workflows-1.png[History with several topic branches]
++For instance, if we have a repository with work in two branches named `ruby_client` and `php_client` that looks like <<merwf_a>>, and we merge `ruby_client` followed by `php_client`, your history will end up looking like <<merwf_b>>.
  
 -.After a topic branch merge.
 -image::images/merging-workflows-2.png[After a topic branch merge.]
++[[merwf_a]]
++.History with several topic branches
++image::images/merging-workflows-1.png[History with several topic branches]
++
 +[[merwf_b]]
 +.After a topic branch merge
 +image::images/merging-workflows-2.png[After a topic branch merge]
@@ -7130,11 +7133,11 @@ diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/pro
 -
 -.After a topic branch merge.
 -image::images/merging-workflows-4.png[After a topic branch merge.]
--
--.After a project release.
--image::images/merging-workflows-5.png[After a topic branch release.]
 +Each time you have a new topic branch to merge in (<<merwf_c>>), you merge it into `develop` (<<merwf_d>>); then, when you tag a release, you fast-forward `master` to wherever the now-stable `develop` branch is (<<merwf_e>>).
  
+-.After a project release.
+-image::images/merging-workflows-5.png[After a topic branch release.]
+-
 -This way, when people clone your project's repository, they can either check out master to build the latest stable version and keep up to date on that easily, or they can check out develop, which is the more cutting-edge stuff.
 -You can also continue this concept, having an integrate branch where all the work is merged together.
 -Then, when the codebase on that branch is stable and passes tests, you merge it into a develop branch; and when that has proven itself stable for a while, you fast-forward your master branch.
@@ -7166,6 +7169,10 @@ diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/pro
  
 -.Managing a complex series of parallel contributed topic branches.
 -image::images/large-merges-1.png[Managing a complex series of parallel contributed topic branches.]
+-
+-If the topics still need work, they're merged into `pu` instead.
+-When it's determined that they're totally stable, the topics are re-merged into `master` and are then rebuilt from the topics that were in `next` but didn't yet graduate to `master`.
+-This means `master` almost always moves forward, `next` is rebased occasionally, and `pu` is rebased even more often:
 +[[merwf_f]]
 +.Managing a complex series of parallel contributed topic branches
 +image::images/large-merges-1.png[Managing a complex series of parallel contributed topic branches]
@@ -7175,10 +7182,6 @@ diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/pro
 +The `next` and `seen` branches are then rebuilt from the `master`.
 +This means `master` almost always moves forward, `next` is rebased occasionally, and `seen` is rebased even more often:
  
--If the topics still need work, they're merged into `pu` instead.
--When it's determined that they're totally stable, the topics are re-merged into `master` and are then rebuilt from the topics that were in `next` but didn't yet graduate to `master`.
--This means `master` almost always moves forward, `next` is rebased occasionally, and `pu` is rebased even more often:
--
 -.Merging contributed topic branches into long-term integration branches.
 -image::images/large-merges-2.png[Merging contributed topic branches into long-term integration branches.]
 +.Merging contributed topic branches into long-term integration branches
@@ -7234,8 +7237,8 @@ diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/pro
  
  Now you can remove your topic branch and drop the commits you didn't want to pull in.
  
-+===== Rerere
-+
+ ===== Rerere
+ 
 +(((git commands, rerere)))(((rerere)))
  If you're doing lots of merging and rebasing, or you're maintaining a long-lived topic branch, Git has a feature called ``rerere'' that can help.
  
@@ -7396,9 +7399,9 @@ diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/pro
 +
  You get a clean summary of all the commits since v1.0.1, grouped by author, that you can email to your list.
 diff -au /tmp/book/06-github/sections/1-setting-up-account.asc.tmp ../../git/progit2/progit2/book/06-github/sections/1-setting-up-account.asc
---- /tmp/book/06-github/sections/1-setting-up-account.asc.tmp	2020-10-25 11:05:02.288641927 +0900
+--- /tmp/book/06-github/sections/1-setting-up-account.asc.tmp	2020-10-25 13:21:06.863938599 +0900
 +++ ../../git/progit2/progit2/book/06-github/sections/1-setting-up-account.asc	2020-07-04 16:36:46.730685537 +0900
-@@ -1,18 +1,22 @@
+@@ -1,21 +1,22 @@
  === Account Setup and Configuration
  
 +(((GitHub, user accounts)))
@@ -7419,14 +7422,16 @@ diff -au /tmp/book/06-github/sections/1-setting-up-account.asc.tmp ../../git/pro
  ====
 -GitHub provides all of its functionality with free accounts, with the limitation that all of your projects are fully public (everyone has read access).
 -GitHub's paid plans include a set number of private projects, but we won't be covering those in this book.
+-====
 +GitHub provides almost all of its functionality with free accounts, except some advanced features.
-+
+ 
+-====
 +GitHub's paid plans include advanced tools and features as well as increased limits for free services, but we won't be covering those in this book.
 +To get more information about available plans and their comparison, visit https://github.com/pricing[].
  ====
  
  Clicking the Octocat logo at the top-left of the screen will take you to your dashboard page.
-@@ -20,40 +24,43 @@
+@@ -23,43 +24,43 @@
  
  ==== SSH Access
  
@@ -7459,6 +7464,9 @@ diff -au /tmp/book/06-github/sections/1-setting-up-account.asc.tmp ../../git/pro
  You can name each of your keys (e.g. "My Laptop" or "Work Account") so that if you need to revoke a key later, you can easily tell which one you're looking for.
  ====
  
+-====
+-====
+-
 +[[_personal_avatar]]
  ==== Your Avatar
  
@@ -7478,7 +7486,7 @@ diff -au /tmp/book/06-github/sections/1-setting-up-account.asc.tmp ../../git/pro
  
  Now anywhere you interact on the site, people will see your avatar next to your username.
  
-@@ -64,10 +71,11 @@
+@@ -70,10 +71,11 @@
  The way that GitHub maps your Git commits to your user is by email address.
  If you use multiple email addresses in your commits and you want GitHub to link them up properly, you need to add all the email addresses you have used to the Emails section of the admin section.
  
@@ -7493,9 +7501,9 @@ diff -au /tmp/book/06-github/sections/1-setting-up-account.asc.tmp ../../git/pro
  The second address is verified and so can be set as the primary if you wish to switch them.
  The final address is unverified, meaning that you can't make it your primary address.
 diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/progit2/book/06-github/sections/2-contributing.asc
---- /tmp/book/06-github/sections/2-contributing.asc.tmp	2020-10-25 11:05:02.295642321 +0900
+--- /tmp/book/06-github/sections/2-contributing.asc.tmp	2020-10-25 13:21:06.875939238 +0900
 +++ ../../git/progit2/progit2/book/06-github/sections/2-contributing.asc	2020-09-30 09:43:39.046514305 +0900
-@@ -4,72 +4,131 @@
+@@ -4,77 +4,131 @@
  
  ==== Forking Projects
  
@@ -7511,6 +7519,9 @@ diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/p
  In GitHub, a ``fork'' is simply the same project in your own namespace, allowing you to make changes to a project publicly as a way to contribute in a more open manner.
  ====
  
+-====
+-====
+-
 -This way, projects don’t have to worry about adding users as collaborators to give them push access.
 +This way, projects don't have to worry about adding users as collaborators to give them push access.
  People can fork a project, push to it, and contribute their changes back to the original repository by creating what's called a Pull Request, which we'll cover next.
@@ -7525,9 +7536,11 @@ diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/p
  
  After a few seconds, you'll be taken to your new project page, with your own writeable copy of the code.
  
-+
+-==== The GitHub Flow
+ 
+-==== GitHub Flow
 +[[ch06-github_flow]]
- ==== The GitHub Flow
++==== The GitHub Flow
  
 +(((GitHub, Flow)))
  GitHub is designed around a particular collaboration workflow, centered on Pull Requests.
@@ -7650,13 +7663,16 @@ diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/p
  If we click that green button, we'll see a screen that asks us to give our Pull Request a title and description.
  It is almost always worthwhile to put some effort into this, since a good description helps the owner of the original project determine what you were trying to do, whether your proposed changes are correct, and whether accepting the changes would improve the original project.
  
-@@ -80,50 +139,69 @@
+@@ -85,56 +139,69 @@
  
  When you hit the 'Create pull request' button on this screen, the owner of the project you forked will get a notification that someone is suggesting a change and will link to a page that has all of this information on it.
  
 +[NOTE]
  ====
 -Though Pull Requests are used commonly for public projects like this when the contributor has a complete change ready to be made, it's also often used in internal projects _at the beginning_ of the development cycle. Since you can keep pushing to the topic branch even *after* the Pull Request is opened, it's often opened early and used as a way to iterate on work as a team within a context, rather than opened at the very end of the process.
+-====
+-
+-====
 +Though Pull Requests are used commonly for public projects like this when the contributor has a complete change ready to be made, it's also often used in internal projects _at the beginning_ of the development cycle.
 +Since you can keep pushing to the topic branch even *after* the Pull Request is opened, it's often opened early and used as a way to iterate on work as a team within a context, rather than opened at the very end of the process.
  ====
@@ -7726,22 +7742,25 @@ diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/p
  .Not Only Forks
  ====
 -It's important to note that you can also open a Pull Request between two branches in the same repository. If you're working on a feature with someone and you both have write access to the project, you can push a topic branch to the repository and open a Pull Request on it to the `master` branch of that same project to initiate the code review and discussion process. No forking necessary.
+-====
+-
+-====
 +It's important to note that you can also open a Pull Request between two branches in the same repository.
 +If you're working on a feature with someone and you both have write access to the project, you can push a topic branch to the repository and open a Pull Request on it to the `master` branch of that same project to initiate the code review and discussion process.
 +No forking necessary.
  ====
  
  ==== Advanced Pull Requests
-@@ -132,151 +210,339 @@
+@@ -143,158 +210,339 @@
  
  ===== Pull Requests as Patches
  
 -It's important to understand that many projects don't really think of Pull Requests as queues of perfect patches that should apply cleanly in order, as most mailing list-based projects think of patch series contributions. Most GitHub projects think about Pull Request branches as iterative conversations around a proposed change, culminating in a unified diff that is applied by merging.
--
--This is an important distinction, because generally the change is suggested before the code is thought to be perfect, which is far more rare with mailing list based patch series contributions. This enables an earlier conversation with the maintainers so that arriving at the proper solution is more of a community effort. When code is proposed with a Pull Request and the maintainers or community suggest a change, the patch series is generally not re-rolled, but instead the difference is pushed as a new commit to the branch, moving the conversation forward with the context of the previous work intact.
 +It's important to understand that many projects don't really think of Pull Requests as queues of perfect patches that should apply cleanly in order, as most mailing list-based projects think of patch series contributions.
 +Most GitHub projects think about Pull Request branches as iterative conversations around a proposed change, culminating in a unified diff that is applied by merging.
  
+-This is an important distinction, because generally the change is suggested before the code is thought to be perfect, which is far more rare with mailing list based patch series contributions. This enables an earlier conversation with the maintainers so that arriving at the proper solution is more of a community effort. When code is proposed with a Pull Request and the maintainers or community suggest a change, the patch series is generally not re-rolled, but instead the difference is pushed as a new commit to the branch, moving the conversation forward with the context of the previous work intact.
+-
 -For instance, if you go back and look again at <<r_pr_final>>, you'll notice that the contributor did not rebase his commit and send another Pull Request. Instead they added new commits and pushed them to the existing branch. This way if you go back and look at this Pull Request in the future, you can easily find all of the context of why decisions were made. Pushing the ``Merge'' button on the site purposefully creates a merge commit that references the Pull Request so that it's easy to go back and research the original conversation if necessary.
 +This is an important distinction, because generally the change is suggested before the code is thought to be perfect, which is far more rare with mailing list based patch series contributions.
 +This enables an earlier conversation with the maintainers so that arriving at the proper solution is more of a community effort.
@@ -7841,10 +7860,12 @@ diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/p
  ===== References
  
 -Your next question may be ``How do I reference the old Pull Request?''. It turns out there are many, many ways to reference other things almost anywhere you can write in GitHub.
+-
+-Let's start with how to cross-reference another Pull Request or an Issue. All Pull Requests and Issues are assigned numbers and they are unique within the project. For example, you can't have Pull Request #3 _and_ Issue #3. If you want to reference any Pull Request or Issue from any other one, you can simply put `#<num>` in any comment or description. You can also be more specific if the Issue or Pull request lives somewhere else; write `username#<num>` if you're referring to an Issue or Pull Request in a fork of the repository you're in, or `username/repo#<num>` to reference something in another repository.
 +Your next question may be ``How do I reference the old Pull Request?''.
 +It turns out there are many, many ways to reference other things almost anywhere you can write in GitHub.
  
--Let's start with how to cross-reference another Pull Request or an Issue. All Pull Requests and Issues are assigned numbers and they are unique within the project. For example, you can't have Pull Request #3 _and_ Issue #3. If you want to reference any Pull Request or Issue from any other one, you can simply put `#<num>` in any comment or description. You can also be more specific if the Issue or Pull request lives somewhere else; write `username#<num>` if you're referring to an Issue or Pull Request in a fork of the repository you're in, or `username/repo#<num>` to reference something in another repository.
+-Let's look at an example. Say we rebased the branch in the previous example, created a new pull request for it, and now we want to reference the old pull request from the new one. We also want to reference an issue in the fork of the repository and an issue in a completely different project. We can fill out the description just like <<r_pr_references>>.
 +Let's start with how to cross-reference another Pull Request or an Issue.
 +All Pull Requests and Issues are assigned numbers and they are unique within the project.
 +For example, you can't have Pull Request #3 _and_ Issue #3.
@@ -7856,8 +7877,6 @@ diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/p
 +We also want to reference an issue in the fork of the repository and an issue in a completely different project.
 +We can fill out the description just like <<_pr_references>>.
  
--Let's look at an example. Say we rebased the branch in the previous example, created a new pull request for it, and now we want to reference the old pull request from the new one. We also want to reference an issue in the fork of the repository and an issue in a completely different project. We can fill out the description just like <<r_pr_references>>.
--
 -.Cross references in a Pull Request.
 +[[_pr_references]]
 +.Cross references in a Pull Request
@@ -7891,14 +7910,16 @@ diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/p
 -==== Markdown
 +==== GitHub Flavored Markdown
  
--Linking to other Issues is just the beginning of interesting things you can do with almost any text box on GitHub. In  Issue and Pull Request descriptions, comments, code comments and more, you can use what is called ``GitHub Flavored Markdown''. Markdown is like writing in plain text but which is rendered richly.
+-==== Markdown
 +Linking to other Issues is just the beginning of interesting things you can do with almost any text box on GitHub.
 +In  Issue and Pull Request descriptions, comments, code comments and more, you can use what is called ``GitHub Flavored Markdown''.
 +Markdown is like writing in plain text but which is rendered richly.
  
--See <<r_example_markdown>> for an example of how comments or text can be written and then rendered using Markdown.
+-Linking to other Issues is just the beginning of interesting things you can do with almost any text box on GitHub. In  Issue and Pull Request descriptions, comments, code comments and more, you can use what is called ``GitHub Flavored Markdown''. Markdown is like writing in plain text but which is rendered richly.
 +See <<_example_markdown>> for an example of how comments or text can be written and then rendered using Markdown.
  
+-See <<r_example_markdown>> for an example of how comments or text can be written and then rendered using Markdown.
+-
 -.An example of Markdown as written and as rendered.
 +[[_example_markdown]]
 +.An example of GitHub Flavored Markdown as written and as rendered
@@ -7906,13 +7927,15 @@ diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/p
  
 -===== GitHub Flavored Markdown
 -
--The GitHub flavor of Markdown adds more things you can do beyond the basic Markdown syntax. These can all be really useful when creating useful Pull Request or Issue comments or descriptions.
+-===== GitHub Flavored Markdown
 +The GitHub flavor of Markdown adds more things you can do beyond the basic Markdown syntax.
 +These can all be really useful when creating useful Pull Request or Issue comments or descriptions.
  
--====== Task Lists
+-The GitHub flavor of Markdown adds more things you can do beyond the basic Markdown syntax. These can all be really useful when creating useful Pull Request or Issue comments or descriptions.
 +===== Task Lists
  
+-====== Task Lists
+-
 -The first really useful GitHub specific Markdown feature, especially for use in Pull Requests, is the Task List. A task list is a list of checkboxes of things you want to get done. Putting them into an Issue or Pull Request normally indicates things that you want to get done before you consider the item complete.
 +The first really useful GitHub specific Markdown feature, especially for use in Pull Requests, is the Task List.
 +A task list is a list of checkboxes of things you want to get done.
@@ -8028,32 +8051,34 @@ diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/p
 +[source,text]
 +----
 +I :eyes: that :bug: and I :cold_sweat:.
-+
+ 
+-When rendered, it would look something like <<r_md_emoji>>.
 +:trophy: for :microscope: it.
-+
+ 
+-.Heavy emoji commenting.
 +:+1: and :sparkles: on this :ship:, it's :fire::poop:!
 +
 +:clap::tada::panda_face:
 +----
- 
--When rendered, it would look something like <<r_md_emoji>>.
++
 +When rendered, it would look something like <<_md_emoji>>.
- 
--.Heavy emoji commenting.
++
 +[[_md_emoji]]
 +.Heavy emoji commenting
  image::images/markdown-07-emoji.png[Emoji]
  
  Not that this is incredibly useful, but it does add an element of fun and emotion to a medium that is otherwise hard to convey emotion in.
  
-+
+-====
+-There are actually quite a number of web services that make use of emoji characters these days. A great cheat sheet to reference to find emoji that expresses what you want to say can be found at:
+ 
+-http://www.emoji-cheat-sheet.com
 +[NOTE]
  ====
--There are actually quite a number of web services that make use of emoji characters these days. A great cheat sheet to reference to find emoji that expresses what you want to say can be found at:
 +There are actually quite a number of web services that make use of emoji characters these days.
 +A great cheat sheet to reference to find emoji that expresses what you want to say can be found at:
  
--http://www.emoji-cheat-sheet.com
+-====
 +https://www.webfx.com/tools/emoji-cheat-sheet/
  ====
  
@@ -8133,7 +8158,7 @@ diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/p
 +Git will happily do this work for you silently, but it won't warn you if you make a commit to `master`, pull from `progit`, then push to `origin` -- all of those operations are valid with this setup.
 +So you'll have to take care never to commit directly to `master`, since that branch effectively belongs to the upstream repository.
 diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/progit2/book/06-github/sections/3-maintaining.asc
---- /tmp/book/06-github/sections/3-maintaining.asc.tmp	2020-10-25 11:05:02.303642771 +0900
+--- /tmp/book/06-github/sections/3-maintaining.asc.tmp	2020-10-25 13:21:06.885939770 +0900
 +++ ../../git/progit2/progit2/book/06-github/sections/3-maintaining.asc	2020-07-04 16:36:46.732685561 +0900
 @@ -1,4 +1,4 @@
 -[[r_maintaining_gh_project]]
@@ -8141,7 +8166,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  === Maintaining a Project
  
  Now that we're comfortable contributing to a project, let's look at the other side: creating, maintaining and administering your own project.
-@@ -6,33 +6,35 @@
+@@ -6,36 +6,35 @@
  ==== Creating a New Repository
  
  Let's create a new repository to share our project code with.
@@ -8184,11 +8209,14 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
 +It is often preferable to share the HTTPS based URL for a public project, since the user does not have to have a GitHub account to access it for cloning.
  Users will have to have an account and an uploaded SSH key to access your project if you give them the SSH URL.
 -The HTTP one is also exactly the same URL they would paste into a browser to view the project there.
+-====
+-
+-====
 +The HTTPS one is also exactly the same URL they would paste into a browser to view the project there.
  ====
  
  ==== Adding Collaborators
-@@ -43,16 +45,16 @@
+@@ -46,16 +45,16 @@
  
  Click the ``Settings'' link at the bottom of the right-hand sidebar.
  
@@ -8209,7 +8237,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  
  ==== Managing Pull Requests
  
-@@ -63,12 +65,14 @@
+@@ -66,12 +65,14 @@
  
  For these examples, let's assume you are ``tonychacon'' and you've created a new Arduino code project named ``fade''.
  
@@ -8226,7 +8254,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  image::images/maint-01-email.png[Pull Request email notification]
  
  There are a few things to notice about this email.
-@@ -77,21 +81,26 @@
+@@ -80,21 +81,26 @@
  It also gives you a few URLs that you can use from the command line.
  
  If you notice the line that says `git pull <url> patch-1`, this is a simple way to merge in a remote branch without having to add a remote.
@@ -8256,7 +8284,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  image::images/maint-03-email-resp.png[Email response]
  
  Once the code is in a place you like and want to merge it in, you can either pull the code down and merge it locally, either with the `git pull <url> <branch>` syntax we saw earlier, or by adding the fork as a remote and fetching and merging.
-@@ -99,26 +108,41 @@
+@@ -102,26 +108,41 @@
  If the merge is trivial, you can also just hit the ``Merge'' button on the GitHub site.
  This will do a ``non-fast-forward'' merge, creating a merge commit even if a fast-forward merge was possible.
  This means that no matter what, every time you hit the merge button, a merge commit is created.
@@ -8302,7 +8330,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  Of course, if you're in your repository and you run `git ls-remote origin` or whatever remote you want to check, it will show you something similar to this.
  
  If the repository is on GitHub and you have any Pull Requests that have been opened, you'll get these references that are prefixed with `refs/pull/`.
-@@ -130,6 +154,13 @@
+@@ -133,6 +154,13 @@
  
  Now, you could do something like fetching the reference directly.
  
@@ -8316,7 +8344,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  This tells Git, ``Connect to the `origin` remote, and download the ref named `refs/pull/958/head`.''
  Git happily obeys, and downloads everything you need to construct that ref, and puts a pointer to the commit you want under `.git/FETCH_HEAD`.
  You can follow that up with `git merge FETCH_HEAD` into a branch you want to test it in, but that merge commit message looks a bit weird.
-@@ -139,21 +170,55 @@
+@@ -142,21 +170,55 @@
  Open up `.git/config` in your favorite editor, and look for the `origin` remote.
  It should look a bit like this:
  
@@ -8372,7 +8400,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  ===== Pull Requests on Pull Requests
  
  Not only can you open Pull Requests that target the main or `master` branch, you can actually open a Pull Request targeting any branch in the network.
-@@ -164,7 +229,8 @@
+@@ -167,7 +229,8 @@
  When you go to open a Pull Request, there is a box at the top of the page that specifies which branch you're requesting to pull to and which you're requesting to pull from.
  If you hit the ``Edit'' button at the right of that box you can change not only the branches but also which fork.
  
@@ -8382,7 +8410,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  image::images/maint-04-target.png[PR targets]
  
  Here you can fairly easily specify to merge your new branch into another Pull Request or another fork of the project.
-@@ -175,7 +241,7 @@
+@@ -178,7 +241,7 @@
  
  In any comment you can start typing a `@` character and it will begin to autocomplete with the names and usernames of people who are collaborators or contributors in the project.
  
@@ -8391,7 +8419,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  image::images/maint-05-mentions.png[Mentions]
  
  You can also mention a user who is not in that dropdown, but often the autocompleter can make it faster.
-@@ -188,7 +254,7 @@
+@@ -191,7 +254,7 @@
  You will also be subscribed to something if you opened it, if you're watching the repository or if you comment on something.
  If you no longer wish to receive notifications, there is an ``Unsubscribe'' button on the page you can click to stop receiving updates on it.
  
@@ -8400,7 +8428,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  image::images/maint-06-unsubscribe.png[Unsubscribe]
  
  ===== The Notifications Page
-@@ -196,7 +262,7 @@
+@@ -199,7 +262,7 @@
  When we mention ``notifications'' here with respect to GitHub, we mean a specific way that GitHub tries to get in touch with you when events happen and there are a few different ways you can configure them.
  If you go to the ``Notification center'' tab from the settings page, you can see some of the options you have.
  
@@ -8409,7 +8437,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  image::images/maint-07-notifications.png[Notification center]
  
  The two choices are to get notifications over ``Email'' and over ``Web'' and you can choose either, neither or both for when you actively participate in things and for activity on repositories you are watching.
-@@ -204,9 +270,10 @@
+@@ -207,9 +270,10 @@
  ====== Web Notifications
  
  Web notifications only exist on GitHub and you can only check them on GitHub.
@@ -8422,7 +8450,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  image::images/maint-08-notifications-page.png[Notification center]
  
  If you click on that, you will see a list of all the items you have been notified about, grouped by project.
-@@ -221,12 +288,25 @@
+@@ -224,12 +288,25 @@
  
  Email notifications are the other way you can handle notifications through GitHub.
  If you have this turned on you will get emails for each notification.
@@ -8450,21 +8478,9 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  
  There are a couple of interesting things here.
  If you want to highlight or re-route emails to this particular project or even Pull Request, the information in `Message-ID` gives you all the data in `<user>/<project>/<type>/<id>` format.
-@@ -241,6 +321,8 @@
- 
- There are a couple of special files that GitHub will notice if they are present in your repository.
- 
-+==== README
-+
- The first is the `README` file, which can be of nearly any format that GitHub recognizes as prose.
- For example, it could be `README`, `README.md`, `README.asciidoc`, etc.
- If GitHub sees a README file in your source, it will render it on the landing page of the project.
-@@ -256,10 +338,13 @@
+@@ -264,9 +341,10 @@
+ ==== CONTRIBUTING
  
- Since GitHub will render this file, you can embed images or links in it for added ease of understanding.
- 
-+==== CONTRIBUTING
-+
  The other special file that GitHub recognizes is the `CONTRIBUTING` file.
 -If you have a file named `CONTRIBUTING` with any file extension, GitHub will show <<r_contrib_file>> when anyone starts opening a Pull Request.
 +If you have a file named `CONTRIBUTING` with any file extension, GitHub will show <<_contrib_file>> when anyone starts opening a Pull Request.
@@ -8475,7 +8491,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  image::images/maint-09-contrib.png[Contributing notice]
  
  The idea here is that you can specify specific things you want or don't want in a Pull Request sent to your project.
-@@ -273,7 +358,8 @@
+@@ -280,7 +358,8 @@
  
  If you are using a branch other than ``master'' as your default branch that you want people to open Pull Requests on or see by default, you can change that in your repository's settings page under the ``Options'' tab.
  
@@ -8485,7 +8501,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  image::images/maint-10-default-branch.png[Default branch]
  
  Simply change the default branch in the dropdown and that will be the default for all major operations from then on, including which branch is checked out by default when someone clones the repository.
-@@ -282,7 +368,8 @@
+@@ -289,7 +368,8 @@
  
  If you would like to transfer a project to another user or an organization in GitHub, there is a ``Transfer ownership'' option at the bottom of the same ``Options'' tab of your repository settings page that allows you to do this.
  
@@ -8496,7 +8512,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
  
  This is helpful if you are abandoning a project and someone wants to take it over, or if your project is getting bigger and want to move it into an organization.
 diff -au /tmp/book/06-github/sections/4-managing-organization.asc.tmp ../../git/progit2/progit2/book/06-github/sections/4-managing-organization.asc
---- /tmp/book/06-github/sections/4-managing-organization.asc.tmp	2020-10-25 11:05:02.309643108 +0900
+--- /tmp/book/06-github/sections/4-managing-organization.asc.tmp	2020-10-25 13:21:06.893940195 +0900
 +++ ../../git/progit2/progit2/book/06-github/sections/4-managing-organization.asc	2020-07-04 16:36:46.732685561 +0900
 @@ -1,6 +1,7 @@
 -[[r_github_orgs]]
@@ -8564,7 +8580,7 @@ diff -au /tmp/book/06-github/sections/4-managing-organization.asc.tmp ../../git/
  
  You can also filter down to specific types of events, specific places or specific people.
 diff -au /tmp/book/06-github/sections/5-scripting.asc.tmp ../../git/progit2/progit2/book/06-github/sections/5-scripting.asc
---- /tmp/book/06-github/sections/5-scripting.asc.tmp	2020-10-25 11:05:02.315643446 +0900
+--- /tmp/book/06-github/sections/5-scripting.asc.tmp	2020-10-25 13:21:06.902940674 +0900
 +++ ../../git/progit2/progit2/book/06-github/sections/5-scripting.asc	2020-07-04 16:36:46.733685573 +0900
 @@ -5,7 +5,7 @@
  Luckily for us, GitHub is really quite hackable in many ways.
@@ -8622,7 +8638,7 @@ diff -au /tmp/book/06-github/sections/5-scripting.asc.tmp ../../git/progit2/prog
  ----
  require 'sinatra'
  require 'json'
-@@ -97,16 +101,19 @@
+@@ -97,18 +101,19 @@
  For each hook you can dig down into when it was delivered, if it was successful and the body and headers for both the request and the response.
  This makes it incredibly easy to test and debug your hooks.
  
@@ -8638,6 +8654,8 @@ diff -au /tmp/book/06-github/sections/5-scripting.asc.tmp ../../git/progit2/prog
  
  ==== The GitHub API
  
+-==== GitHub API
+-
 -Services and hooks give you a way to receive push notifications about events that happen on your repositories, but what if you need more information about these events? What if you need to automate something like adding collaborators or labeling issues?
 +(((GitHub, API)))
 +Services and hooks give you a way to receive push notifications about events that happen on your repositories, but what if you need more information about these events?
@@ -8645,7 +8663,7 @@ diff -au /tmp/book/06-github/sections/5-scripting.asc.tmp ../../git/progit2/prog
  
  This is where the GitHub API comes in handy.
  GitHub has tons of API endpoints for doing nearly anything you can do on the website in an automated fashion.
-@@ -118,9 +125,47 @@
+@@ -120,9 +125,47 @@
  This could be a user or read-only information on an open source project.
  For example, if we want to know more about a user named ``schacon'', we can run something like this:
  
@@ -8693,7 +8711,7 @@ diff -au /tmp/book/06-github/sections/5-scripting.asc.tmp ../../git/progit2/prog
  ==== Commenting on an Issue
  
  However, if you want to do an action on the website such as comment on an Issue or Pull Request or if you want to view or interact with private content, you'll need to authenticate.
-@@ -129,7 +174,8 @@
+@@ -131,7 +174,8 @@
  You can use basic authentication with just your username and password, but generally it's a better idea to use a personal access token.
  You can generate this from the ``Applications'' tab of your settings page.
  
@@ -8703,7 +8721,7 @@ diff -au /tmp/book/06-github/sections/5-scripting.asc.tmp ../../git/progit2/prog
  image::images/scripting-05-access-token.png[Access Token]
  
  It will ask you which scopes you want for this token and a description.
-@@ -147,9 +193,32 @@
+@@ -149,9 +193,32 @@
  Let's say we want to leave a comment on a specific issue, Issue #6.
  To do so we have to do an HTTP POST request to `repos/<user>/<repo>/issues/<num>/comments` with the token we just generated as an Authorization header.
  
@@ -8729,16 +8747,16 @@ diff -au /tmp/book/06-github/sections/5-scripting.asc.tmp ../../git/progit2/prog
 +  "body": "A new comment, :+1:"
 +}
 +----
++
++Now if you go to that issue, you can see the comment that we just successfully posted as in <<_api_comment>>.
  
 -.A comment posted from the GitHub API.
-+Now if you go to that issue, you can see the comment that we just successfully posted as in <<_api_comment>>.
-+
 +[[_api_comment]]
 +.A comment posted from the GitHub API
  image::images/scripting-06-comment.png[API Comment]
  
  You can use the API to do just about anything you can do on the website -- creating and setting milestones, assigning people to Issues and Pull Requests, creating and changing labels, accessing commit data, creating new commits and branches, opening, closing or merging Pull Requests, creating and editing teams, commenting on lines of code in a Pull Request, searching the site and on and on.
-@@ -164,6 +233,7 @@
+@@ -166,6 +233,7 @@
  
  Let's say you set up a webhook on your repository that hits a small web service that checks for a `Signed-off-by` string in the commit message.
  
@@ -8746,7 +8764,7 @@ diff -au /tmp/book/06-github/sections/5-scripting.asc.tmp ../../git/progit2/prog
  ----
  require 'httparty'
  require 'sinatra'
-@@ -212,18 +282,21 @@
+@@ -214,9 +282,10 @@
  In this case you can send a state ('success', 'failure', 'error'), a description of what happened, a target URL the user can go to for more information and a ``context'' in case there are multiple statuses for a single commit.
  For example, a testing service may provide a status and a validation service like this may also provide a status -- the ``context'' field is how they're differentiated.
  
@@ -8759,11 +8777,8 @@ diff -au /tmp/book/06-github/sections/5-scripting.asc.tmp ../../git/progit2/prog
  image::images/scripting-07-status.png[Commit status]
  
  You can now see a little green check mark next to the commit that has a ``Signed-off-by'' string in the message and a red cross through the one where the author forgot to sign off.
- You can also see that the Pull Request takes the status of the last commit on the branch and warns you if it is a failure.
- This is really useful if you're using this API for test results so you don't accidentally merge something where the last commit is failing tests.
+@@ -227,7 +296,7 @@
  
-+==== Octokit
-+
  Though we've been doing nearly everything through `curl` and simple HTTP requests in these examples, several open-source libraries exist that make this API available in a more idiomatic way.
  At the time of this writing, the supported languages include Go, Objective-C, Ruby, and .NET.
 -Check out http://github.com/octokit[] for more information on these, as they handle much of the HTTP for you.
@@ -8772,7 +8787,7 @@ diff -au /tmp/book/06-github/sections/5-scripting.asc.tmp ../../git/progit2/prog
  Hopefully these tools can help you customize and modify GitHub to work better for your specific workflows.
  For complete documentation on the entire API as well as guides for common tasks, check out https://developer.github.com[].
 diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/advanced-merging.asc
---- /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp	2020-10-25 11:05:02.322643839 +0900
+--- /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp	2020-10-25 13:21:06.914941312 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/advanced-merging.asc	2020-07-04 16:36:46.733685573 +0900
 @@ -1,4 +1,4 @@
 -[[r_advanced_merging]]
@@ -9059,7 +9074,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
  ===== Checking Out Conflicts
  
  Perhaps we're not happy with the resolution at this point for some reason, or maybe manually editing one or both sides still didn't work well and we need more context.
-@@ -107,46 +309,128 @@
+@@ -107,48 +309,128 @@
  Let's change up the example a little.
  For this example, we have two longer lived branches that each have a few commits in them but create a legitimate content conflict when merged.
  
@@ -9097,7 +9112,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
 +def hello
 +<<<<<<< HEAD
 +  puts 'hola world'
-+=======
+ =======
 +  puts 'hello mundo'
 +>>>>>>> mundo
 +end
@@ -9135,7 +9150,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
 +  puts 'hola world'
 +||||||| base
 +  puts 'hello world'
-+=======
+ =======
 +  puts 'hello mundo'
 +>>>>>>> theirs
 +end
@@ -9191,7 +9206,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
  If you run that with the `-p` option instead, you get just the diffs to the file that ended up in conflict.
  This can be *really* helpful in quickly giving you the context you need to help understand why something conflicts and how to more intelligently resolve it.
  
-@@ -157,20 +441,91 @@
+@@ -159,20 +441,91 @@
  
  When you run `git diff` directly after a merge conflict, it will give you information in a rather unique diff output format.
  
@@ -9284,7 +9299,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
  ==== Undoing Merges
  
  Now that you know how to create a merge commit, you'll probably make some by mistake.
-@@ -180,7 +535,7 @@
+@@ -182,7 +535,7 @@
  Let's say you started work on a topic branch, accidentally merged it into `master`, and now your commit history looks like this:
  
  .Accidental merge commit
@@ -9293,7 +9308,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
  
  There are two ways to approach this problem, depending on what your desired outcome is.
  
-@@ -190,9 +545,9 @@
+@@ -192,9 +545,9 @@
  In most cases, if you follow the errant `git merge` with `git reset --hard HEAD~`, this will reset the branch pointers so they look like this:
  
  .History after `git reset --hard HEAD~`
@@ -9305,7 +9320,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
  Here's a quick refresher: `reset --hard` usually goes through three steps:
  
  . Move the branch HEAD points to.
-@@ -201,14 +556,21 @@
+@@ -203,14 +556,21 @@
  . Make the working directory look like the index.
  
  The downside of this approach is that it's rewriting history, which can be problematic with a shared repository.
@@ -9328,7 +9343,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
  The `-m 1` flag indicates which parent is the ``mainline'' and should be kept.
  When you invoke a merge into `HEAD` (`git merge topic`), the new commit has two parents: the first one is `HEAD` (`C6`), and the second is the tip of the branch being merged in (`C4`).
  In this case, we want to undo all the changes introduced by merging in parent #2 (`C4`), while keeping all the content from parent #1 (`C6`).
-@@ -216,21 +578,34 @@
+@@ -218,21 +578,34 @@
  The history with the revert commit looks like this:
  
  .History after `git revert -m 1`
@@ -9366,7 +9381,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
  
  In this example, `M` and `^M` cancel out.
  `^^M` effectively merges in the changes from `C3` and `C4`, and `C8` merges in the changes from `C7`, so now `topic` is fully merged.
-@@ -255,8 +630,28 @@
+@@ -257,8 +630,28 @@
  
  If we go back to the ``hello world'' example we were using before, we can see that merging in our branch causes conflicts.
  
@@ -9395,7 +9410,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
  In that case, instead of getting conflict markers in the file with ``hello mundo'' on one side and ``hola world'' on the other, it will simply pick ``hola world''.
  However, all the other non-conflicting changes on that branch are merged successfully in.
  
-@@ -269,9 +664,19 @@
+@@ -271,9 +664,19 @@
  It will record a new merge commit with both branches as parents, but it will not even look at the branch you're merging in.
  It will simply record as the result of the merge the exact code in your current branch.
  
@@ -9416,7 +9431,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
 +
 +include::subtree-merges.asc[]
 diff -au /tmp/book/07-git-tools/sections/bundling.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/bundling.asc
---- /tmp/book/07-git-tools/sections/bundling.asc.tmp	2020-10-25 11:05:02.328644177 +0900
+--- /tmp/book/07-git-tools/sections/bundling.asc.tmp	2020-10-25 13:21:06.922941738 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/bundling.asc	2020-06-28 16:44:50.939017414 +0900
 @@ -1,4 +1,4 @@
 -[[r_bundling]]
@@ -9585,7 +9600,7 @@ diff -au /tmp/book/07-git-tools/sections/bundling.asc.tmp ../../git/progit2/prog
  
  So, `git bundle` can be really useful for sharing or doing network-type operations when you don't have the proper network or shared repository to do so.
 diff -au /tmp/book/07-git-tools/sections/credentials.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/credentials.asc
---- /tmp/book/07-git-tools/sections/credentials.asc.tmp	2020-10-25 11:05:02.334644514 +0900
+--- /tmp/book/07-git-tools/sections/credentials.asc.tmp	2020-10-25 13:21:06.928942057 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/credentials.asc	2020-06-28 16:44:50.939017414 +0900
 @@ -1,6 +1,8 @@
 -[[r_credential_caching]]
@@ -9741,7 +9756,7 @@ diff -au /tmp/book/07-git-tools/sections/credentials.asc.tmp ../../git/progit2/p
 +
  As you can see, extending this system is pretty straightforward, and can solve some common problems for you and your team.
 diff -au /tmp/book/07-git-tools/sections/debugging.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/debugging.asc
---- /tmp/book/07-git-tools/sections/debugging.asc.tmp	2020-10-25 11:05:02.339644795 +0900
+--- /tmp/book/07-git-tools/sections/debugging.asc.tmp	2020-10-25 13:21:06.934942377 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/debugging.asc	2020-06-28 16:44:50.939017414 +0900
 @@ -1,62 +1,149 @@
  === Debugging with Git
@@ -9913,7 +9928,7 @@ diff -au /tmp/book/07-git-tools/sections/debugging.asc.tmp ../../git/progit2/pro
  Doing so automatically runs `test-error.sh` on each checked-out commit until Git finds the first broken commit.
  You can also run something like `make` or `make tests` or whatever you have that runs automated tests for you.
 diff -au /tmp/book/07-git-tools/sections/interactive-staging.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/interactive-staging.asc
---- /tmp/book/07-git-tools/sections/interactive-staging.asc.tmp	2020-10-25 11:05:02.345645133 +0900
+--- /tmp/book/07-git-tools/sections/interactive-staging.asc.tmp	2020-10-25 13:21:06.946943015 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/interactive-staging.asc	2020-06-28 16:44:50.939017414 +0900
 @@ -1,57 +1,204 @@
 -[[r_interactive_staging]]
@@ -10146,7 +10161,7 @@ diff -au /tmp/book/07-git-tools/sections/interactive-staging.asc.tmp ../../git/p
 +Furthermore, you can use patch mode for partially resetting files with the `git reset --patch` command, for checking out parts of files with the `git checkout --patch` command and for stashing parts of files with the `git stash save --patch` command.
  We'll go into more details on each of these as we get to more advanced usages of these commands.
 diff -au /tmp/book/07-git-tools/sections/replace.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/replace.asc
---- /tmp/book/07-git-tools/sections/replace.asc.tmp	2020-10-25 11:05:02.350645414 +0900
+--- /tmp/book/07-git-tools/sections/replace.asc.tmp	2020-10-25 13:21:06.954943440 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/replace.asc	2020-07-04 16:36:46.733685573 +0900
 @@ -1,13 +1,13 @@
 -[[r_replace]]
@@ -10236,7 +10251,7 @@ diff -au /tmp/book/07-git-tools/sections/replace.asc.tmp ../../git/progit2/progi
  It's useful in this case to create a base commit that has instructions on how to expand the history, so other developers know what to do if they hit the first commit in the truncated history and need more.
  So, what we're going to do is create an initial commit object as our base point with instructions, then rebase the remaining commits (four and five) on top of it.
  
-@@ -34,37 +83,124 @@
+@@ -34,40 +83,124 @@
  So, our base commit will be based off of that tree.
  We can create our base commit using the `commit-tree` command, which just takes a tree and will give us a brand new, parentless commit object SHA-1 back.
  
@@ -10255,8 +10270,10 @@ diff -au /tmp/book/07-git-tools/sections/replace.asc.tmp ../../git/progit2/progi
 +You can read more about plumbing commands in <<ch10-git-internals#_plumbing_porcelain>>.
  =====
  
+-=====
+-=====
 +image::images/replace3.png[]
-+
+ 
  OK, so now that we have a base commit, we can rebase the rest of our history on top of that with `git rebase --onto`.
  The `--onto` argument will be the SHA-1 we just got back from `commit-tree` and the rebase point will be the third commit (the parent of the first commit we want to keep, `9c68fdc`):
  
@@ -10364,9 +10381,9 @@ diff -au /tmp/book/07-git-tools/sections/replace.asc.tmp ../../git/progit2/progi
  This means that it's easy to share our replacement with others, because we can push this to our server and other people can easily download it.
  This is not that helpful in the history grafting scenario we've gone over here (since everyone would be downloading both histories anyhow, so why separate them?) but it can be useful in other circumstances.
 diff -au /tmp/book/07-git-tools/sections/rerere.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/rerere.asc
---- /tmp/book/07-git-tools/sections/rerere.asc.tmp	2020-10-25 11:05:02.356645752 +0900
+--- /tmp/book/07-git-tools/sections/rerere.asc.tmp	2020-10-25 13:21:06.960943760 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/rerere.asc	2020-06-28 16:44:50.940017561 +0900
-@@ -1,67 +1,252 @@
+@@ -1,68 +1,252 @@
 -[[r_rerere]]
 +[[ref_rerere]]
  === Rerere
@@ -10574,8 +10591,6 @@ diff -au /tmp/book/07-git-tools/sections/rerere.asc.tmp ../../git/progit2/progit
 -You can also recreate the conflicted file state with the `checkout` command:
 +Also, `git diff` will show you how it was automatically re-resolved:
  
--We saw an example of this in <<r_advanced_merging>>.
--For now though, let's re-resolve it by just running `rerere` again:
 +[source,console]
 +----
 +$ git diff
@@ -10606,7 +10621,9 @@ diff -au /tmp/book/07-git-tools/sections/rerere.asc.tmp ../../git/progit2/progit
 +def hello
 +<<<<<<< ours
 +  puts 'hola world'
-+=======
+ =======
+-We saw an example of this in <<r_advanced_merging>>.
+-For now though, let's re-resolve it by just running `rerere` again:
 +  puts 'hello mundo'
 +>>>>>>> theirs
 +end
@@ -10640,7 +10657,7 @@ diff -au /tmp/book/07-git-tools/sections/rerere.asc.tmp ../../git/progit2/progit
 +
 +So, if you do a lot of re-merges, or want to keep a topic branch up to date with your `master` branch without a ton of merges, or you rebase often, you can turn on `rerere` to help your life out a bit.
 diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/reset.asc
---- /tmp/book/07-git-tools/sections/reset.asc.tmp	2020-10-25 11:05:02.362646089 +0900
+--- /tmp/book/07-git-tools/sections/reset.asc.tmp	2020-10-25 13:21:06.969944238 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/reset.asc	2020-07-04 16:36:46.733685573 +0900
 @@ -1,16 +1,16 @@
 -[[r_git_reset]]
@@ -10664,8 +10681,12 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
  
  Git as a system manages and manipulates three trees in its normal operation:
  
-@@ -26,63 +26,112 @@
+@@ -24,67 +24,114 @@
+ 
+ ===== The HEAD
  
+-===== HEAD
+-
  HEAD is the pointer to the current branch reference, which is in turn a pointer to the last commit made on that branch.
  That means HEAD will be the parent of the next commit that is created.
 -It's generally simplest to think of HEAD as the snapshot of *your last commit*.
@@ -10689,9 +10710,9 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
 +100644 blob 8f94139338f9404f2...   Rakefile
 +040000 tree 99f1a6d12cb4b6f19...   lib
 +----
- 
-+The Git `cat-file` and `ls-tree` commands are ``plumbing'' commands that are used for lower level things and not really used in day-to-day work, but they help us see what's going on here.
 +
++The Git `cat-file` and `ls-tree` commands are ``plumbing'' commands that are used for lower level things and not really used in day-to-day work, but they help us see what's going on here.
+ 
 +[[_the_index]]
  ===== The Index
  
@@ -10749,16 +10770,16 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
  We'll call this *v1* of the file, and we'll indicate it in blue.
 -Now we run `git init`, which will create a Git repository with a HEAD reference which points to an unborn branch (`master` doesn't exist yet).
 +Now we run `git init`, which will create a Git repository with a HEAD reference which points to the unborn `master` branch.
-+
-+image::images/reset-ex1.png[]
  
 -At this point, only the Working Directory tree has any content.
-+At this point, only the working directory tree has any content.
++image::images/reset-ex1.png[]
  
 -Now we want to commit this file, so we use `git add` to take content in the Working Directory and copy it to the Index.
-+Now we want to commit this file, so we use `git add` to take content in the working directory and copy it to the index.
++At this point, only the working directory tree has any content.
  
 -Then we run `git commit`, which takes the contents of the Index and saves it as a permanent snapshot, creates a commit object which points to that snapshot, and updates `master` to point to that commit.
++Now we want to commit this file, so we use `git add` to take content in the working directory and copy it to the index.
++
 +image::images/reset-ex2.png[]
 +
 +Then we run `git commit`, which takes the contents of the index and saves it as a permanent snapshot, creates a commit object which points to that snapshot, and updates `master` to point to that commit.
@@ -10775,12 +10796,12 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
 -If we run `git status` right now, we'll see the file in red as ``Changes not staged for commit,'' because that entry differs between the Index and the Working Directory.
 -Next we run `git add` on it to stage it into our Index.
 +image::images/reset-ex4.png[]
-+
-+If we run `git status` right now, we'll see the file in red as ``Changes not staged for commit'', because that entry differs between the index and the working directory.
-+Next we run `git add` on it to stage it into our index.
  
 -At this point if we run `git status` we will see the file in green
 -under ``Changes to be committed'' because the Index and HEAD differ – that is, our proposed next commit is now different from our last commit.
++If we run `git status` right now, we'll see the file in red as ``Changes not staged for commit'', because that entry differs between the index and the working directory.
++Next we run `git add` on it to stage it into our index.
++
 +image::images/reset-ex5.png[]
 +
 +At this point, if we run `git status`, we will see the file in green under ``Changes to be committed'' because the index and HEAD differ -- that is, our proposed next commit is now different from our last commit.
@@ -10796,7 +10817,7 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
  
  ==== The Role of Reset
  
-@@ -91,6 +140,8 @@
+@@ -93,6 +140,8 @@
  For the purposes of these examples, let's say that we've modified `file.txt` again and committed it a third time.
  So now our history looks like this:
  
@@ -10805,7 +10826,7 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
  Let's now walk through exactly what `reset` does when you call it.
  It directly manipulates these three trees in a simple and predictable way.
  It does up to three basic operations.
-@@ -101,19 +152,23 @@
+@@ -103,19 +152,23 @@
  This isn't the same as changing HEAD itself (which is what `checkout` does); `reset` moves the branch that HEAD is pointing to.
  This means if HEAD is set to the `master` branch (i.e. you're currently on the `master` branch), running `git reset 9e5e6a4` will start by making `master` point to `9e5e6a4`.
  
@@ -10833,7 +10854,7 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
  
  If you specify the `--mixed` option, `reset` will stop at this point.
  This is also the default, so if you specify no option at all (just `git reset HEAD~` in this case), this is where the command will stop.
-@@ -123,69 +178,82 @@
+@@ -125,69 +178,82 @@
  
  ===== Step 3: Updating the Working Directory (--hard)
  
@@ -10933,7 +10954,7 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
  Now you can see that your reachable history, the history you would push, now looks like you had one commit with `file-a.txt` v1, then a second that both modified `file-a.txt` to v3 and added `file-b.txt`.
  The commit with the v2 version of the file is no longer in the history.
  
-@@ -199,11 +267,11 @@
+@@ -201,11 +267,11 @@
  Running `git checkout [branch]` is pretty similar to running `git reset --hard [branch]` in that it updates all three trees for you to look like `[branch]`, but there are two important differences.
  
  First, unlike `reset --hard`, `checkout` is working-directory safe; it will check to make sure it's not blowing away files that have changes to them.
@@ -10948,7 +10969,7 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
  
  For instance, say we have `master` and `develop` branches which point at different commits, and we're currently on `develop` (so HEAD points to it).
  If we run `git reset master`, `develop` itself will now point to the same commit that `master` does.
-@@ -213,11 +281,13 @@
+@@ -215,11 +281,13 @@
  So, in both cases we're moving HEAD to point to commit A, but _how_ we do so is very different.
  `reset` will move the branch HEAD points to, `checkout` moves HEAD itself.
  
@@ -10963,7 +10984,7 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
  
  Also, like `git reset` and `git add`, `checkout` will accept a `--patch` option to allow you to selectively revert file contents on a hunk-by-hunk basis.
  
-@@ -227,7 +297,7 @@
+@@ -229,7 +297,7 @@
  
  Here's a cheat-sheet for which commands affect which trees.
  The ``HEAD'' column reads ``REF'' if that command moves the reference (branch) that HEAD points to, and ``HEAD'' if it moves HEAD itself.
@@ -10972,7 +10993,7 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
  
  [options="header", cols="3,1,1,1,1"]
  |================================
-@@ -236,8 +306,8 @@
+@@ -238,8 +306,8 @@
  | `reset --soft [commit]` | REF | NO | NO | YES
  | `reset [commit]` | REF | YES | NO | YES
  | `reset --hard [commit]` | REF | YES | YES | *NO*
@@ -10985,7 +11006,7 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
 +| `checkout [commit] <paths>` | NO | YES | YES | *NO*
  |================================
 diff -au /tmp/book/07-git-tools/sections/revision-selection.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/revision-selection.asc
---- /tmp/book/07-git-tools/sections/revision-selection.asc.tmp	2020-10-25 11:05:02.369646483 +0900
+--- /tmp/book/07-git-tools/sections/revision-selection.asc.tmp	2020-10-25 13:21:06.977944664 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/revision-selection.asc	2020-10-24 08:43:10.529548324 +0900
 @@ -1,36 +1,76 @@
 -[[r_revision_selection]]
@@ -11077,7 +11098,7 @@ diff -au /tmp/book/07-git-tools/sections/revision-selection.asc.tmp ../../git/pr
  
  However, you should be aware of how ridiculously unlikely this scenario is.
  The SHA-1 digest is 20 bytes or 160 bits.
-@@ -38,117 +78,326 @@
+@@ -38,120 +78,326 @@
  (the formula for determining collision probability is `p = (n(n-1)/2) * (1/2^160))`. 2^80^
  is 1.2 x 10^24^
  or 1 million billion billion.
@@ -11087,10 +11108,12 @@ diff -au /tmp/book/07-git-tools/sections/revision-selection.asc.tmp ../../git/pr
 -Here’s an example to give you an idea of what it would take to get a SHA-1 collision.
 -If all 6.5 billion humans on Earth were programming, and every second, each one was producing code that was the equivalent of the entire Linux kernel history (3.6 million Git objects) and pushing it into one enormous Git repository, it would take roughly 2 years until that repository contained enough objects to have a 50% probability of a single SHA-1 object collision.
 -A higher probability exists that every member of your programming team will be attacked and killed by wolves in unrelated incidents on the same night.
+-====
 +Here's an example to give you an idea of what it would take to get a SHA-1 collision.
 +If all 6.5 billion humans on Earth were programming, and every second, each one was producing code that was the equivalent of the entire Linux kernel history (6.5 million Git objects) and pushing it into one enormous Git repository, it would take roughly 2 years until that repository contained enough objects to have a 50% probability of a single SHA-1 object collision.
 +Thus, an organic SHA-1 collision is less likely than every member of your programming team being attacked and killed by wolves in unrelated incidents on the same night.
-+
+ 
+-====
 +If you dedicate several thousands of dollars' worth of computing power to it, it is possible to synthesize two files with the same hash, as proven on https://shattered.io/[] in February 2017.
 +Git is moving towards using SHA256 as the default hashing algorithm, which is much more resilient to collision attacks, and has code in place to help mitigate this attack (although it cannot completely eliminate it).
  ====
@@ -11157,14 +11180,14 @@ diff -au /tmp/book/07-git-tools/sections/revision-selection.asc.tmp ../../git/pr
  You can also use this syntax to see where a branch was some specific amount of time ago.
 -For instance, to see where your `master` branch was yesterday, you can type
 +For instance, to see where your `master` branch was yesterday, you can type:
-+
+ 
+-That shows you where the branch tip was yesterday.
+-This technique only works for data that’s still in your reflog, so you can’t use it to look for commits older than a few months.
 +[source,console]
 +----
 +$ git show master@{yesterday}
 +----
- 
--That shows you where the branch tip was yesterday.
--This technique only works for data that’s still in your reflog, so you can’t use it to look for commits older than a few months.
++
 +That would show you where tip of your `master` branch was yesterday.
 +This technique only works for data that's still in your reflog, so you can't use it to look for commits older than a few months.
  
@@ -11251,7 +11274,8 @@ diff -au /tmp/book/07-git-tools/sections/revision-selection.asc.tmp ../../git/pr
 +Merge: 1c002dd... 35cfb2b...
 +Author: Scott Chacon <[e-mail]>
 +Date:   Thu Dec 11 15:08:43 2008 -0800
-+
+ 
+-The other main ancestry specification is the `~`.
 +    Merge commit 'phedders/rdocs'
 +----
 +
@@ -11290,8 +11314,7 @@ diff -au /tmp/book/07-git-tools/sections/revision-selection.asc.tmp ../../git/pr
 +
 +    Some rdoc changes
 +----
- 
--The other main ancestry specification is the `~`.
++
 +The other main ancestry specification is the `~` (tilde).
  This also refers to the first parent, so `HEAD~` and `HEAD^` are equivalent.
  The difference becomes apparent when you specify a number.
@@ -11456,7 +11479,7 @@ diff -au /tmp/book/07-git-tools/sections/revision-selection.asc.tmp ../../git/pr
  
  With these tools, you can much more easily let Git know what commit or commits you want to inspect.
 diff -au /tmp/book/07-git-tools/sections/rewriting-history.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/rewriting-history.asc
---- /tmp/book/07-git-tools/sections/rewriting-history.asc.tmp	2020-10-25 11:05:02.375646820 +0900
+--- /tmp/book/07-git-tools/sections/rewriting-history.asc.tmp	2020-10-25 13:21:06.989945302 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/rewriting-history.asc	2020-09-12 09:27:13.222663694 +0900
 @@ -1,114 +1,346 @@
 -[[r_rewriting_history]]
@@ -11895,9 +11918,9 @@ diff -au /tmp/book/07-git-tools/sections/rewriting-history.asc.tmp ../../git/pro
  This goes through and rewrites every commit to have your new address.
  Because commits contain the SHA-1 values of their parents, this command changes every commit SHA-1 in your history, not just those that have the matching email address.
 diff -au /tmp/book/07-git-tools/sections/searching.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/searching.asc
---- /tmp/book/07-git-tools/sections/searching.asc.tmp	2020-10-25 11:05:02.381647157 +0900
+--- /tmp/book/07-git-tools/sections/searching.asc.tmp	2020-10-25 13:21:06.994945568 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/searching.asc	2020-06-28 16:44:50.941017708 +0900
-@@ -1,28 +1,91 @@
+@@ -1,30 +1,91 @@
 -[[r_searching]]
 +[[_searching]]
  === Searching
@@ -11907,20 +11930,21 @@ diff -au /tmp/book/07-git-tools/sections/searching.asc.tmp ../../git/progit2/pro
  Git provides a couple of useful tools for looking through the code and commits stored in its database quickly and easily.
  We'll go through a few of them.
  
--Git ships with a command called `grep` that allows you to easily search through any committed tree or the working directory for a string or regular expression.
--For these examples, we'll look through the Git source code itself.
 +[[_git_grep]]
-+==== Git Grep
+ ==== Git Grep
  
--By default, it will look through the files in your working directory.
--You can pass `-n` to print out the line numbers where Git has found matches.
+-Git ships with a command called `grep` that allows you to easily search through any committed tree or the working directory for a string or regular expression.
+-For these examples, we'll look through the Git source code itself.
 +Git ships with a command called `grep` that allows you to easily search through any committed tree, the working directory, or even the index for a string or regular expression.
 +For the examples that follow, we'll search through the source code for Git itself.
  
--There are a number of interesting options you can provide the `grep` command.
+-By default, it will look through the files in your working directory.
+-You can pass `-n` to print out the line numbers where Git has found matches.
 +By default, `git grep` will look through the files in your working directory.
 +As a first variation, you can use either of the `-n` or `--line-number` options to print out the line numbers where Git has found matches:
  
+-There are a number of interesting options you can provide the `grep` command.
+-
 -For instance, instead of the previous call, you can have Git summarize the output by just showing you which files matched and how many matches there were in each file with the `--count` option:
 -
 -If you want to see what method or function it thinks it has found a match in, you can pass `-p`:
@@ -12006,7 +12030,7 @@ diff -au /tmp/book/07-git-tools/sections/searching.asc.tmp ../../git/progit2/pro
  
  The `git grep` command has a few advantages over normal searching commands like `grep` and `ack`.
  The first is that it's really fast, the second is that you can search through any tree in Git, not just the working directory.
-@@ -30,24 +93,68 @@
+@@ -32,24 +93,68 @@
  
  ==== Git Log Searching
  
@@ -12083,7 +12107,7 @@ diff -au /tmp/book/07-git-tools/sections/searching.asc.tmp ../../git/progit2/pro
 +For example, this would have done the same thing as the example above: `git log -L '/unsigned long git_deflate_bound/',/^}/:zlib.c`.
  You could also give it a range of lines or a single line number and you'll get the same sort of output.
 diff -au /tmp/book/07-git-tools/sections/signing.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/signing.asc
---- /tmp/book/07-git-tools/sections/signing.asc.tmp	2020-10-25 11:05:02.386647439 +0900
+--- /tmp/book/07-git-tools/sections/signing.asc.tmp	2020-10-25 13:21:07.002945994 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/signing.asc	2020-06-28 16:44:50.941017708 +0900
 @@ -1,4 +1,4 @@
 -[[r_signing]]
@@ -12122,7 +12146,7 @@ diff -au /tmp/book/07-git-tools/sections/signing.asc.tmp ../../git/progit2/progi
  Now Git will use your key by default to sign tags and commits if you want.
  
  ==== Signing Tags
-@@ -19,36 +39,163 @@
+@@ -19,37 +39,163 @@
  If you have a GPG private key setup, you can now use it to sign new tags.
  All you have to do is use `-s` instead of `-a`:
  
@@ -12154,7 +12178,7 @@ diff -au /tmp/book/07-git-tools/sections/signing.asc.tmp ../../git/progit2/progi
 +ecorc4iXzQu7tupRihslbNkfvfciMnSDeSvzCpWAHl7h8Wj6hhqePmLm9lAYqnKp
 +8S5B/1SSQuEAjRZgI4IexpZoeKGVDptPHxLLS38fozsyi0QyDyzEgJxcJQVMXxVi
 +RUysgqjcpT8+iQM1PblGfHR4XAhuOqN5Fx06PSaFZhqvWFezJ28/CLyX5q+oIVk=
-+=EFTF
+ =EFTF
 +-----END PGP SIGNATURE-----
 +
 +commit ca82a6dff817ec66f44342007202690a93763949
@@ -12292,7 +12316,7 @@ diff -au /tmp/book/07-git-tools/sections/signing.asc.tmp ../../git/progit2/progi
  
  Signing tags and commits is great, but if you decide to use this in your normal workflow, you'll have to make sure that everyone on your team understands how to do so.
 diff -au /tmp/book/07-git-tools/sections/stashing-cleaning.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/stashing-cleaning.asc
---- /tmp/book/07-git-tools/sections/stashing-cleaning.asc.tmp	2020-10-25 11:05:02.392647776 +0900
+--- /tmp/book/07-git-tools/sections/stashing-cleaning.asc.tmp	2020-10-25 13:21:07.011946473 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/stashing-cleaning.asc	2020-06-28 16:44:50.941017708 +0900
 @@ -1,72 +1,234 @@
 -[[r_git_stashing]]
@@ -12621,7 +12645,7 @@ diff -au /tmp/book/07-git-tools/sections/stashing-cleaning.asc.tmp ../../git/pro
 +In cases like that, you need to add a second `-f` option for emphasis.
 +====
 diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/submodules.asc
---- /tmp/book/07-git-tools/sections/submodules.asc.tmp	2020-10-25 11:05:02.400648226 +0900
+--- /tmp/book/07-git-tools/sections/submodules.asc.tmp	2020-10-25 13:21:07.024947164 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/submodules.asc	2020-07-21 09:34:56.067548780 +0900
 @@ -1,21 +1,22 @@
 -[[r_git_submodules]]
@@ -12653,7 +12677,7 @@ diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/pr
  ==== Starting with Submodules
  
  We'll walk through developing a simple project that has been split up into a main project and a few sub-projects.
-@@ -24,86 +25,432 @@
+@@ -24,89 +25,432 @@
  To add a new submodule you use the `git submodule add` command with the absolute or relative URL of the project you would like to start tracking.
  In this example, we'll add a library called ``DbConnector''.
  
@@ -12706,12 +12730,13 @@ diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/pr
  This is how other people who clone this project know where to get the submodule projects from.
  
 +[NOTE]
-+=====
+ =====
  Since the URL in the .gitmodules file is what other people will first try to clone/fetch from, make sure to use a URL that they can access if possible.
  For example, if you use a different URL to push to than others would to pull from, use the one that others have access to.
  You can overwrite this value locally with `git config submodule.DbConnector.url PRIVATE_URL` for your own use.
  When applicable, a relative URL can be helpful.
-+=====
+-
+ =====
  
  The other listing in the `git status` output is the project folder entry.
  If you run `git diff` on that, you see something interesting:
@@ -12765,12 +12790,12 @@ diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/pr
 +That is a special mode in Git that basically means you're recording a commit as a directory entry rather than a subdirectory or a file.
 +
 +Lastly, push these changes:
- 
++
 +[source,console]
 +----
 +$ git push origin master
 +----
-+
+ 
 +[[_cloning_submodules]]
  ==== Cloning a Project with Submodules
  
@@ -13096,7 +13121,7 @@ diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/pr
  
  ===== Working on a Submodule
  
-@@ -113,53 +460,181 @@
+@@ -116,53 +460,181 @@
  So now let's go through an example of making changes to the submodule at the same time as the main project and committing and publishing those changes at the same time.
  
  So far, when we've run the `git submodule update` command to fetch changes from the submodule repositories, Git would get the changes and update the files in the subdirectory but will leave the sub-repository in what's called a ``detached HEAD'' state.
@@ -13283,7 +13308,7 @@ diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/pr
  
  ===== Merging Submodule Changes
  
-@@ -171,6 +646,22 @@
+@@ -174,6 +646,22 @@
  Git will not attempt even a trivial merge for you, however.
  If the submodule commits diverge and need to be merged, you will get something that looks like this:
  
@@ -13306,7 +13331,7 @@ diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/pr
  So basically what has happened here is that Git has figured out that the two branches record points in the submodule's history that are divergent and need to be merged.
  It explains it as ``merge following commits not found'', which is confusing but we'll explain why that is in a bit.
  
-@@ -179,6 +670,15 @@
+@@ -182,6 +670,15 @@
  Fortunately, it's simple to figure out.
  If you run `git diff` you can get the SHA-1s of the commits recorded in both branches you were trying to merge.
  
@@ -13322,7 +13347,7 @@ diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/pr
  So, in this case, `eb41d76` is the commit in our submodule that *we* had and `c771610` is the commit that upstream had.
  If we go into our submodule directory, it should already be on `eb41d76` as the merge would not have touched it.
  If for whatever reason it's not, you can simply create and checkout a branch pointing to it.
-@@ -188,15 +688,55 @@
+@@ -191,15 +688,55 @@
  You can either just try the merge with the SHA-1 directly, or you can create a branch for it and then try to merge that in.
  We would suggest the latter, even if only to make a nicer merge commit message.
  
@@ -13384,7 +13409,7 @@ diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/pr
  
  It can be a bit confusing, but it's really not very hard.
  
-@@ -209,7 +749,38 @@
+@@ -212,7 +749,38 @@
  
  If it does find a single acceptable merge commit, you'll see something like this:
  
@@ -13424,15 +13449,7 @@ diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/pr
  
  This accomplishes the same thing, but at least this way you can verify that it works and you have the code in your submodule directory when you're done.
  
-@@ -217,52 +788,248 @@
- 
- There are a few things you can do to make working with submodules a little easier.
- 
-+===== Submodule Foreach
-+
- There is a `foreach` submodule command to run some arbitrary command in each submodule.
- This can be really helpful if you have a number of submodules in the same project.
- 
+@@ -228,46 +796,240 @@
  For example, let's say we want to start a new feature or do a bugfix and we have work going on in several submodules.
  We can easily stash all the work in all our submodules.
  
@@ -13678,7 +13695,7 @@ diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/pr
  You may need to go into your submodule directory and run a `git checkout .` to get all your files back.
  You could run this in a `submodule foreach` script to run it for multiple submodules.
 diff -au /tmp/book/07-git-tools/sections/subtree-merges.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/subtree-merges.asc
---- /tmp/book/07-git-tools/sections/subtree-merges.asc.tmp	2020-10-25 11:05:02.406648564 +0900
+--- /tmp/book/07-git-tools/sections/subtree-merges.asc.tmp	2020-10-25 13:21:07.032947590 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/subtree-merges.asc	2020-07-04 16:36:46.737685622 +0900
 @@ -1,4 +1,4 @@
 -[[r_subtree_merge]]
@@ -13789,7 +13806,7 @@ diff -au /tmp/book/07-git-tools/sections/subtree-merges.asc.tmp ../../git/progit
 +$ git diff-tree -p rack_remote/master
 +----
 diff -au /tmp/book/08-customizing-git/sections/attributes.asc.tmp ../../git/progit2/progit2/book/08-customizing-git/sections/attributes.asc
---- /tmp/book/08-customizing-git/sections/attributes.asc.tmp	2020-10-25 11:05:02.411648845 +0900
+--- /tmp/book/08-customizing-git/sections/attributes.asc.tmp	2020-10-25 13:21:07.043948175 +0900
 +++ ../../git/progit2/progit2/book/08-customizing-git/sections/attributes.asc	2020-07-04 16:36:46.738685634 +0900
 @@ -1,5 +1,6 @@
  === Git Attributes
@@ -14015,7 +14032,7 @@ diff -au /tmp/book/08-customizing-git/sections/attributes.asc.tmp ../../git/prog
  In this case, when you commit files that match `*.c`, Git will run them through the indent program before it stages them and then run them through the `cat` program before it checks them back out onto disk.
  The `cat` program does essentially nothing: it spits out the same data that it comes in.
  This combination effectively filters all C source code files through `indent` before committing.
-@@ -115,45 +228,125 @@
+@@ -115,22 +228,57 @@
  To do this properly, you need a small script that takes a filename, figures out the last commit date for this project, and inserts the date into the file.
  Here is a small Ruby script that does that:
  
@@ -14072,11 +14089,8 @@ diff -au /tmp/book/08-customizing-git/sections/attributes.asc.tmp ../../git/prog
 +(((archiving)))
  Git attribute data also allows you to do some interesting things when exporting an archive of your project.
  
-+===== `export-ignore`
-+
- You can tell Git not to export certain files or directories when generating an archive.
- If there is a subdirectory or file that you don't want to include in your archive file but that you do want checked into your project, you can determine those files via the `export-ignore` attribute.
- 
+ ===== `export-ignore`
+@@ -141,23 +289,64 @@
  For example, say you have some test files in a `test/` subdirectory, and it doesn't make sense to include them in the tarball export of your project.
  You can add the following line to your Git attributes file:
  
@@ -14085,13 +14099,13 @@ diff -au /tmp/book/08-customizing-git/sections/attributes.asc.tmp ../../git/prog
 +----
 +test/ export-ignore
 +----
++
++Now, when you run `git archive` to create a tarball of your project, that directory won't be included in the archive.
+ 
+ ===== `export-subst`
  
 -When exporting files for deployment you can apply `git log`'s formatting and keyword-expansion processing to selected portions of files marked with the
 -`export-subst` attribute.
-+Now, when you run `git archive` to create a tarball of your project, that directory won't be included in the archive.
-+
-+===== `export-subst`
-+
 +When exporting files for deployment you can apply `git log`'s formatting and keyword-expansion processing to selected portions of files marked with the `export-subst` attribute.
  
  For instance, if you want to include a file named `LAST_COMMIT` in your project, and have metadata about the last commit automatically injected into it when `git archive` runs, you can for example set up your `.gitattributes` and `LAST_COMMIT` files like this:
@@ -14145,7 +14159,7 @@ diff -au /tmp/book/08-customizing-git/sections/attributes.asc.tmp ../../git/prog
  You can also use Git attributes to tell Git to use different merge strategies for specific files in your project.
  One very useful option is to tell Git to not try to merge specific files when they have conflicts, but rather to use your side of the merge over someone else's.
  
-@@ -161,8 +354,25 @@
+@@ -165,8 +354,25 @@
  Say you have a database settings file called `database.xml` that is different in two branches, and you want to merge in your other branch without messing up the database file.
  You can set up an attribute like this:
  
@@ -14172,9 +14186,9 @@ diff -au /tmp/book/08-customizing-git/sections/attributes.asc.tmp ../../git/prog
 +
  In this case, `database.xml` stays at whatever version you originally had.
 diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/progit2/book/08-customizing-git/sections/config.asc
---- /tmp/book/08-customizing-git/sections/config.asc.tmp	2020-10-25 11:05:02.417649182 +0900
+--- /tmp/book/08-customizing-git/sections/config.asc.tmp	2020-10-25 13:21:07.057948919 +0900
 +++ ../../git/progit2/progit2/book/08-customizing-git/sections/config.asc	2020-08-10 10:02:15.170231399 +0900
-@@ -1,187 +1,466 @@
+@@ -1,97 +1,202 @@
 -[[r_git_config]]
 +[[_git_config]]
  === Git Configuration
@@ -14209,10 +14223,11 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
 +Each of these ``levels'' (system, global, local) overwrites values in the previous level, so values in `.git/config` trump those in `[path]/etc/gitconfig`, for instance.
  
 +[NOTE]
-+====
+ ====
  Git's configuration files are plain-text, so you can also set these values by manually editing the file and inserting the correct syntax.
  It's generally easier to run the `git config` command, though.
-+====
+-
+ ====
  
  ==== Basic Client Configuration
  
@@ -14233,8 +14248,8 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
  This command lists all the available options in quite a bit of detail.
 -You can also find this reference material at http://git-scm.com/docs/git-config.html[].
 +You can also find this reference material at https://git-scm.com/docs/git-config[].
-+
-+===== `core.editor`
+ 
+ ===== `core.editor`
  
 -By default, Git uses whatever you've set as your default text editor (`$VISUAL` or `$EDITOR`) or else falls back to the `vi` editor to create and edit your commit and tag messages.
 +((($EDITOR)))((($VISUAL, see $EDITOR)))
@@ -14248,10 +14263,10 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
 +
  Now, no matter what is set as your default shell editor, Git will fire up Emacs to edit messages.
  
+ ===== `commit.template`
+ 
 -If you set this to the path of a file on your system, Git will use that file as the default message when you commit.
 -For instance, suppose you create a template file at `~/.gitmessage.txt` that looks like this:
-+===== `commit.template`
-+
 +(((commit templates)))
 +If you set this to the path of a file on your system, Git will use that file as the default initial message when you commit.
 +The value in creating a custom commit template is that you can use it to remind yourself (or others) of the proper format and style when creating a commit message.
@@ -14303,8 +14318,8 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
 +
  If your team has a commit-message policy, then putting a template for that policy on your system and configuring Git to use it by default can help increase the chance of that policy being followed regularly.
  
-+===== `core.pager`
-+
+ ===== `core.pager`
+ 
 +(((pager)))
  This setting determines which pager is used when Git pages output such as `log` and `diff`.
  You can set it to `more` or to your favorite pager (by default, it's `less`), or you can turn it off by setting it to a blank string:
@@ -14316,9 +14331,9 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
 +
  If you run that, Git will page the entire output of all commands, no matter how long they are.
  
+ ===== `user.signingkey`
+ 
 -If you're making signed annotated tags (as discussed in <<ch07-git-tools#r_signing>>), setting your GPG signing key as a configuration setting makes things easier.
-+===== `user.signingkey`
-+
 +(((GPG)))
 +If you're making signed annotated tags (as discussed in <<ch07-git-tools#_signing>>), setting your GPG signing key as a configuration setting makes things easier.
  Set your key ID like so:
@@ -14330,14 +14345,14 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
 +
  Now, you can sign tags without having to specify your key every time with the `git tag` command:
  
--You can put patterns in your project's `.gitignore` file to have Git not see them as untracked files or try to stage them when you run `git add` on them, as discussed in <<ch02-git-basics#r_ignoring>>.
 +[source,console]
 +----
 +$ git tag -s <tag-name>
 +----
 +
-+===== `core.excludesfile`
-+
+ ===== `core.excludesfile`
+ 
+-You can put patterns in your project's `.gitignore` file to have Git not see them as untracked files or try to stage them when you run `git add` on them, as discussed in <<ch02-git-basics#r_ignoring>>.
 +(((excludes)))(((.gitignore)))
 +You can put patterns in your project's `.gitignore` file to have Git not see them as untracked files or try to stage them when you run `git add` on them, as discussed in <<ch02-git-basics-chapter#_ignoring>>.
  
@@ -14359,8 +14374,8 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
 +
  …and you run `git config --global core.excludesfile ~/.gitignore_global`, Git will never again bother you about those files.
  
-+===== `help.autocorrect`
-+
+ ===== `help.autocorrect`
+ 
 +(((autocorrect)))
  If you mistype a command, it shows you something like this:
  
@@ -14395,8 +14410,7 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
  Git fully supports colored terminal output, which greatly aids in visually parsing command output quickly and easily.
  A number of options can help you set the coloring to your preference.
  
-+===== `color.ui`
-+
+@@ -100,6 +205,11 @@
  Git automatically colors most of its output, but there's a master switch if you don't like this behavior.
  To turn off all Git's colored terminal output, do this:
  
@@ -14408,11 +14422,7 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
  The default setting is `auto`, which colors output when it's going straight to a terminal, but omits the color-control codes when the output is redirected to a pipe or a file.
  
  You can also set it to `always` to ignore the difference between terminals and pipes.
- You'll rarely want this; in most scenarios, if you want color codes in your redirected output, you can instead pass a `--color` flag to the Git command to force it to use color codes.
- The default setting is almost always what you'll want.
- 
-+===== `color.*`
-+
+@@ -111,100 +221,246 @@
  If you want to be more specific about which commands are colored and how, Git provides verb-specific coloring settings.
  Each of these can be set to `true`, `false`, or `always`:
  
@@ -14585,8 +14595,8 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
  It's very easy for patches or other collaborated work to introduce subtle whitespace changes because editors silently introduce them, and if your files ever touch a Windows system, their line endings might be replaced.
  Git has a few configuration options to help with these issues.
  
-+===== `core.autocrlf`
-+
+ ===== `core.autocrlf`
+ 
 +(((crlf)))(((line endings)))
  If you're programming on Windows and working with people who are not (or vice-versa), you'll probably run into line-ending issues at some point.
 -This is because Windows uses both a carriage-return character and a linefeed character for newlines in its files, whereas Mac and Linux systems use only the linefeed character.
@@ -14622,8 +14632,8 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
 +$ git config --global core.autocrlf false
 +----
 +
-+===== `core.whitespace`
-+
+ ===== `core.whitespace`
+ 
  Git comes preset to detect and fix some whitespace issues.
 -It can look for six primary whitespace issues – three are enabled by default and can be turned off, and three are disabled by default but can be activated.
 +It can look for six primary whitespace issues -- three are enabled by default and can be turned off, and three are disabled by default but can be activated.
@@ -14671,13 +14681,7 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
  These options apply to the `git rebase` command as well.
  If you've committed whitespace issues but haven't yet pushed upstream, you can run `git rebase --whitespace=fix` to have Git automatically fix whitespace issues as it's rewriting the patches.
  
-@@ -189,23 +468,44 @@
- 
- Not nearly as many configuration options are available for the server side of Git, but there are a few interesting ones you may want to take note of.
- 
-+===== `receive.fsckObjects`
-+
- Git is capable of making sure every object received during a push still matches its SHA-1 checksum and points to valid objects.
+@@ -218,6 +474,11 @@
  However, it doesn't do this by default; it's a fairly expensive operation, and might slow down the operation, especially on large repositories or pushes.
  If you want Git to check object consistency on every push, you can force it to do so by setting `receive.fsckObjects` to true:
  
@@ -14688,10 +14692,8 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
 +
  Now, Git will check the integrity of your repository before each push is accepted to make sure faulty (or malicious) clients aren't introducing corrupt data.
  
-+===== `receive.denyNonFastForwards`
-+
- If you rebase commits that you've already pushed and then try to push again, or otherwise try to push a commit to a remote branch that doesn't contain the commit that the remote branch currently points to, you'll be denied.
- This is generally good policy; but in the case of the rebase, you may determine that you know what you're doing and can force-update the remote branch with a `-f` flag to your push command.
+ ===== `receive.denyNonFastForwards`
+@@ -227,6 +488,11 @@
  
  To tell Git to refuse force-pushes, set `receive.denyNonFastForwards`:
  
@@ -14703,8 +14705,7 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
  The other way you can do this is via server-side receive hooks, which we'll cover in a bit.
  That approach lets you do more complex things like deny non-fast-forwards to a certain subset of users.
  
-+===== `receive.denyDeletes`
-+
+@@ -235,6 +501,11 @@
  One of the workarounds to the `denyNonFastForwards` policy is for the user to delete the branch and then push it back up with the new reference.
  To avoid this, set `receive.denyDeletes` to true:
  
@@ -14719,7 +14720,7 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
 -There are also more interesting ways to do this on a per-user basis via ACLs, as you'll learn in <<r_an_example_git_enforced_policy>>.
 +There are also more interesting ways to do this on a per-user basis via ACLs, as you'll learn in <<ch08-customizing-git#_an_example_git_enforced_policy>>.
 diff -au /tmp/book/08-customizing-git/sections/hooks.asc.tmp ../../git/progit2/progit2/book/08-customizing-git/sections/hooks.asc
---- /tmp/book/08-customizing-git/sections/hooks.asc.tmp	2020-10-25 11:05:02.424649576 +0900
+--- /tmp/book/08-customizing-git/sections/hooks.asc.tmp	2020-10-25 13:21:07.066949398 +0900
 +++ ../../git/progit2/progit2/book/08-customizing-git/sections/hooks.asc	2020-09-26 08:56:07.952296414 +0900
 @@ -1,6 +1,7 @@
 -[[r_git_hooks]]
@@ -14739,20 +14740,20 @@ diff -au /tmp/book/08-customizing-git/sections/hooks.asc.tmp ../../git/progit2/p
  If you want to use the bundled hook scripts, you'll have to rename them; their file names all end with `.sample`.
  
  To enable a hook script, put a file in the `hooks` subdirectory of your .git directory that is named appropriately (without any extension) and is executable.
-@@ -23,8 +24,11 @@
+@@ -23,10 +24,10 @@
  There are a lot of client-side hooks.
  This section splits them into committing-workflow hooks, email-workflow scripts, and everything else.
  
 +[NOTE]
-+====
+ ====
  It's important to note that client-side hooks are *not* copied when you clone a repository.
 -If your intent with these scripts is to enforce a policy, you'll probably want to do that on the server side; see the example in <<r_an_example_git_enforced_policy>>.
+-
 +If your intent with these scripts is to enforce a policy, you'll probably want to do that on the server side; see the example in <<ch08-customizing-git#_an_example_git_enforced_policy>>.
-+====
+ ====
  
  ===== Committing-Workflow Hooks
- 
-@@ -43,12 +47,13 @@
+@@ -46,12 +47,13 @@
  
  The `commit-msg` hook takes one parameter, which again is the path to a temporary file that contains the commit message written by the developer.
  If this script exits non-zero, Git aborts the commit process, so you can use it to validate your project state or commit message before allowing a commit to go through.
@@ -14767,7 +14768,7 @@ diff -au /tmp/book/08-customizing-git/sections/hooks.asc.tmp ../../git/progit2/p
  ===== Email Workflow Hooks
  
  You can set up three client-side hooks for an email-based workflow.
-@@ -69,6 +74,7 @@
+@@ -72,6 +74,7 @@
  You can use it to notify a group or the author of the patch you pulled in that you've done so.
  You can't stop the patching process with this script.
  
@@ -14775,26 +14776,7 @@ diff -au /tmp/book/08-customizing-git/sections/hooks.asc.tmp ../../git/progit2/p
  ===== Other Client Hooks
  
  The `pre-rebase` hook runs before you rebase anything and can halt the process by exiting non-zero.
-@@ -99,16 +105,27 @@
- These scripts run before and after pushes to the server.
- The pre hooks can exit non-zero at any time to reject the push as well as print an error message back to the client; you can set up a push policy that's as complex as you wish.
- 
-+===== `pre-receive`
-+
- The first script to run when handling a push from a client is `pre-receive`.
- It takes a list of references that are being pushed from stdin; if it exits non-zero, none of them are accepted.
- You can use this hook to do things like make sure none of the updated references are non-fast-forwards, or to do access control for all the refs and files they're modifying with the push.
- 
-+===== `update`
-+
- The `update` script is very similar to the `pre-receive` script, except that it's run once for each branch the pusher is trying to update.
- If the pusher is trying to push to multiple branches, `pre-receive` runs only once, whereas update runs once per branch they're pushing to.
- Instead of reading from stdin, this script takes three arguments: the name of the reference (branch), the SHA-1 that reference pointed to before the push, and the SHA-1 the user is trying to push.
- If the update script exits non-zero, only that reference is rejected; other references can still be updated.
- 
-+===== `post-receive`
-+
- The `post-receive` hook runs after the entire process is completed and can be used to update other services or notify users.
+@@ -121,3 +124,8 @@
  It takes the same stdin data as the `pre-receive` hook.
  Examples include emailing a list, notifying a continuous integration server, or updating a ticket-tracking system – you can even parse the commit messages to see if any tickets need to be opened, modified, or closed.
  This script can't stop the push process, but the client doesn't disconnect until it has completed, so be careful if you try to do anything that may take a long time.
@@ -14804,7 +14786,7 @@ diff -au /tmp/book/08-customizing-git/sections/hooks.asc.tmp ../../git/progit2/p
 +If you're writing a script/hook that others will need to read, prefer the long versions of command-line flags; six months from now you'll thank us.
 +====
 diff -au /tmp/book/08-customizing-git/sections/policy.asc.tmp ../../git/progit2/progit2/book/08-customizing-git/sections/policy.asc
---- /tmp/book/08-customizing-git/sections/policy.asc.tmp	2020-10-25 11:05:02.429649857 +0900
+--- /tmp/book/08-customizing-git/sections/policy.asc.tmp	2020-10-25 13:21:07.075949877 +0900
 +++ ../../git/progit2/progit2/book/08-customizing-git/sections/policy.asc	2020-07-04 16:36:46.738685634 +0900
 @@ -1,6 +1,7 @@
 -[[r_an_example_git_enforced_policy]]
@@ -15215,7 +15197,7 @@ diff -au /tmp/book/08-customizing-git/sections/policy.asc.tmp ../../git/progit2/
  You're looking for any commit that is reachable from the last commit on the remote and that isn't reachable from any parent of any of the SHA-1s you're trying to push up – meaning it's a fast-forward.
 Warning: file not found: ../../git/progit2/progit2-ja/book/09-git-and-other-scms/sections/client-bzr.asc
 diff -au /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp ../../git/progit2/progit2/book/09-git-and-other-scms/sections/client-hg.asc
---- /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp	2020-10-25 11:05:02.436650251 +0900
+--- /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp	2020-10-25 13:21:07.085950409 +0900
 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/client-hg.asc	2020-07-01 10:48:37.622009668 +0900
 @@ -1,5 +1,7 @@
  ==== Git and Mercurial
@@ -15225,12 +15207,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp ../../git/pr
  The DVCS universe is larger than just Git.
  In fact, there are many other systems in this space, each with their own angle on how to do distributed version control correctly.
  Apart from Git, the most popular is Mercurial, and the two are very similar in many respects.
-@@ -8,22 +10,41 @@
- Since the way Git talks to server repositories is through remotes, it should come as no surprise that this bridge is implemented as a remote helper.
- The project's name is git-remote-hg, and it can be found at https://github.com/felipec/git-remote-hg[].
- 
-+===== git-remote-hg
-+
+@@ -13,19 +15,36 @@
  First, you need to install git-remote-hg.
  This basically entails dropping its file somewhere in your path, like so:
  
@@ -15269,7 +15246,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp ../../git/pr
  ===== Getting Started
  
  Now that we have a suitable ``server-side'' repository, we can go through a typical workflow.
-@@ -31,6 +52,15 @@
+@@ -33,6 +52,15 @@
  
  As always with Git, first we clone:
  
@@ -15285,7 +15262,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp ../../git/pr
  You'll notice that working with a Mercurial repository uses the standard `git clone` command.
  That's because git-remote-hg is working at a fairly low level, using a similar mechanism to how Git's HTTP/S protocol is implemented (remote helpers).
  Since Git and Mercurial are both designed for every client to have a full copy of the repository history, this command makes a full clone, including all the project's history, and does it fairly quickly.
-@@ -39,6 +69,28 @@
+@@ -41,6 +69,28 @@
  It turns out some of these aren't actually there.
  Let's take a look at what's actually in the `.git` directory:
  
@@ -15314,7 +15291,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp ../../git/pr
  Git-remote-hg is trying to make things more idiomatically Git-esque, but under the hood it's managing the conceptual mapping between two slightly different systems.
  The `refs/hg` directory is where the actual remote refs are stored.
  For example, the `refs/hg/origin/branches/default` is a Git ref file that contains the SHA-1 starting with ``ac7955c'', which is the commit that `master` points to.
-@@ -47,6 +99,26 @@
+@@ -49,6 +99,26 @@
  The `notes/hg` file is the starting point for how git-remote-hg maps Git commit hashes to Mercurial changeset IDs.
  Let's explore a bit:
  
@@ -15341,7 +15318,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp ../../git/pr
  So `refs/notes/hg` points to a tree, which in the Git object database is a list of other objects with names.
  `git ls-tree` outputs the mode, type, object hash, and filename for items inside a tree.
  Once we dig down to one of the tree items, we find that inside it is a blob named ``ac9117f'' (the SHA-1 hash of the commit pointed to by `master`), with contents ``0a04b98'' (which is the ID of the Mercurial changeset at the tip of the `default` branch).
-@@ -58,6 +130,11 @@
+@@ -60,6 +130,11 @@
  Mercurial and Git use a very similar mechanism for this, but it's likely you don't want to actually commit a `.gitignore` file into a Mercurial repository.
  Fortunately, Git has a way to ignore files that's local to an on-disk repository, and the Mercurial format is compatible with Git, so you just have to copy it over:
  
@@ -15353,7 +15330,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp ../../git/pr
  The `.git/info/exclude` file acts just like a `.gitignore`, but isn't included in commits.
  
  ===== Workflow
-@@ -65,19 +142,92 @@
+@@ -67,19 +142,92 @@
  Let's assume we've done some work and made some commits on the `master` branch, and you're ready to push it to the remote repository.
  Here's what our repository looks like right now:
  
@@ -15446,7 +15423,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp ../../git/pr
  The changeset numbered _2_ was made by Mercurial, and the changesets numbered _3_ and _4_ were made by git-remote-hg, by pushing commits made with Git.
  
  ===== Branches and Bookmarks
-@@ -89,31 +239,158 @@
+@@ -91,31 +239,158 @@
  The branch that a changeset is made on is recorded _with the changeset_, which means it will always be in the repository history.
  Here's an example of a commit that was made on the `develop` branch:
  
@@ -15606,7 +15583,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp ../../git/pr
  
  Git and Mercurial are similar enough that working across the boundary is fairly painless.
 diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/progit2/progit2/book/09-git-and-other-scms/sections/client-p4.asc
---- /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp	2020-10-25 11:05:02.444650701 +0900
+--- /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp	2020-10-25 13:21:07.096950994 +0900
 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/client-p4.asc	2020-07-04 16:36:46.740685658 +0900
 @@ -1,5 +1,7 @@
  ==== Git and Perforce
@@ -15616,18 +15593,18 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/pr
  Perforce is a very popular version-control system in corporate environments.
  It's been around since 1995, which makes it the oldest system covered in this chapter.
  As such, it's designed with the constraints of its day; it assumes you're always connected to a single central server, and only one version is kept on the local disk.
-@@ -9,6 +11,10 @@
+@@ -9,8 +11,10 @@
  The first one we'll cover is the ``Git Fusion'' bridge from the makers of Perforce, which lets you expose subtrees of your Perforce depot as read-write Git repositories.
  The second is git-p4, a client-side bridge that lets you use Git as a Perforce client, without requiring any reconfiguration of the Perforce server.
  
 +[[_p4_git_fusion]]
-+===== Git Fusion
-+
+ ===== Git Fusion
+ 
 +(((Perforce, Git Fusion)))
  Perforce provides a product called Git Fusion (available at http://www.perforce.com/git-fusion[]), which synchronizes a Perforce server with Git repositories on the server side.
  
  ====== Setting Up
-@@ -19,14 +25,21 @@
+@@ -21,14 +25,21 @@
  Upon first starting the machine, it asks you to customize the password for three Linux users (`root`, `perforce`, and `git`), and provide an instance name, which can be used to distinguish this installation from others on the same network.
  When that has all completed, you'll see this:
  
@@ -15651,7 +15628,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/pr
  The first one will open a VI editor to customize the user, but you can accept the defaults by typing `:wq` and hitting enter.
  The second one will prompt you to enter a password twice.
  That's all we need to do with a shell prompt, so exit out of the session.
-@@ -35,8 +48,27 @@
+@@ -37,8 +48,27 @@
  The Git Fusion image comes with a certificate, but it's for a domain that won't match your virtual machine's IP address, so Git will reject the HTTPS connection.
  If this is going to be a permanent installation, consult the Perforce Git Fusion manual to install a different certificate; for our example purposes, this will suffice:
  
@@ -15679,7 +15656,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/pr
  The virtual-machine image comes equipped with a sample project that you can clone.
  Here we're cloning over HTTPS, with the `john` user that we created above; Git asks for credentials for this connection, but the credential cache will allow us to skip this step for any subsequent requests.
  
-@@ -46,21 +78,86 @@
+@@ -48,21 +78,86 @@
  This is actually fairly easy to do using your favorite Perforce client; just map the `//.git-fusion` directory on the Perforce server into your workspace.
  The file structure looks like this:
  
@@ -15766,7 +15743,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/pr
  This way, if your normal workspace mapping includes changes in the structure of the directories, you can replicate that with a Git repository.
  
  The last file we'll discuss is `users/p4gf_usermap`, which maps Perforce users to Git users, and which you may not even need.
-@@ -68,6 +165,14 @@
+@@ -70,6 +165,14 @@
  When converting the other way, the default is to look up the Perforce user with the email address stored in the Git commit's author field, and submit the changeset as that user (with permissions applying).
  In most cases, this behavior will do just fine, but consider the following mapping file:
  
@@ -15781,7 +15758,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/pr
  Each line is of the format `<user> <email> "<full name>"`, and creates a single user mapping.
  The first two lines map two distinct email addresses to the same Perforce user account.
  This is useful if you've created Git commits under several different email addresses (or change email addresses), but want them to be mapped to the same Perforce user.
-@@ -83,6 +188,32 @@
+@@ -85,6 +188,32 @@
  Let's have a look at how it feels to work from the Git side.
  We'll assume we've mapped in the ``Jam'' project using a configuration file as shown above, which we can clone like this:
  
@@ -15814,7 +15791,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/pr
  The first time you do this, it may take some time.
  What's happening is that Git Fusion is converting all the applicable changesets in the Perforce history into Git commits.
  This happens locally on the server, so it's relatively fast, but if you have a lot of history, it can still take some time.
-@@ -92,19 +223,73 @@
+@@ -94,19 +223,73 @@
  There are three branches, and Git has helpfully created a local `master` branch that tracks `origin/master`.
  Let's do a bit of work, and create a couple of new commits:
  
@@ -15890,27 +15867,27 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/pr
  
  If you've never seen this view before, it may seem confusing, but it shows the same concepts as a graphical viewer for Git history.
  We're looking at the history of the `README` file, so the directory tree at top left only shows that file as it surfaces in various branches.
-@@ -127,12 +312,19 @@
+@@ -129,16 +312,18 @@
  
  If you can't convince the administrator of your server to set up Git Fusion, there is still a way to use these tools together.
  
 +[[_git_p4_client]]
-+===== Git-p4
-+
+ ===== Git-p4
+ 
 +(((git commands, p4)))
  Git-p4 is a two-way bridge between Git and Perforce.
  It runs entirely inside your Git repository, so you won't need any kind of access to the Perforce server (other than user credentials, of course).
  Git-p4 isn't as flexible or complete a solution as Git Fusion, but it does allow you to do most of what you'd want to do without being invasive to the server environment.
  
 +[NOTE]
-+======
+ ======
  You'll need the `p4` tool somewhere in your `PATH` to work with git-p4.
  As of this writing, it is freely available at http://www.perforce.com/downloads/Perforce/20-User[].
-+======
+-
+ ======
  
  ====== Setting Up
- 
-@@ -140,18 +332,44 @@
+@@ -147,18 +332,44 @@
  
  In order to use the `p4` command-line client (which git-p4 depends on), you'll need to set a couple of environment variables:
  
@@ -15955,7 +15932,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/pr
  No remotes exist in this repository at all.
  Git-p4 has created some refs to represent the state of the server, and they look like remote refs to `git log`, but they're not managed by Git itself, and you can't push to them.
  
-@@ -160,13 +378,51 @@
+@@ -167,13 +378,51 @@
  Okay, let's do some work.
  Let's assume you've made some progress on a very important feature, and you're ready to show it to the rest of your team.
  
@@ -16007,7 +15984,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/pr
  You can probably tell from the output, but `git p4 rebase` is a shortcut for `git p4 sync` followed by `git rebase p4/master`.
  It's a bit smarter than that, especially when working with multiple branches, but this is a good approximation.
  
-@@ -174,50 +430,229 @@
+@@ -181,50 +430,229 @@
  The `git p4 submit` command will try to create a new Perforce revision for every Git commit between `p4/master` and `master`.
  Running it drops us into our favorite editor, and the contents of the file look something like this:
  
@@ -16239,9 +16216,9 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/pr
  
  If we now `git checkout -b dev p4/project/dev` and make some commits, git-p4 is smart enough to target the right branch when we do `git p4 submit`.
 diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/progit2/progit2/book/09-git-and-other-scms/sections/client-svn.asc
---- /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp	2020-10-25 11:05:02.451651094 +0900
+--- /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp	2020-10-25 13:21:07.104951419 +0900
 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/client-svn.asc	2020-07-04 16:36:46.740685658 +0900
-@@ -1,16 +1,20 @@
+@@ -1,10 +1,12 @@
 -[[r_git_svn]]
 +[[_git_svn]]
  ==== Git and Subversion
@@ -16255,15 +16232,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  One of Git's great features is a bidirectional bridge to Subversion called `git svn`.
  This tool allows you to use Git as a valid client to a Subversion server, so you can use all the local features of Git and then push to a Subversion server as if you were using Subversion locally.
  This means you can do local branching and merging, use the staging area, use rebasing and cherry-picking, and so on, while your collaborators continue to work in their dark and ancient ways.
- It's a good way to sneak Git into the corporate environment and help your fellow developers become more efficient while you lobby to get the infrastructure changed to support Git fully.
- The Subversion bridge is the gateway drug to the DVCS world.
- 
-+===== `git svn`
-+
- The base command in Git for all the Subversion bridging commands is `git svn`.
- It takes quite a few commands, so we'll show the most common while going through a few simple workflows.
- 
-@@ -24,18 +28,48 @@
+@@ -26,18 +28,48 @@
  ===== Setting Up
  
  To demonstrate this functionality, you need a typical SVN repository that you have write access to.
@@ -16315,7 +16284,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  
  Although this operation may take only a few minutes, if you try to copy the original repository to another remote repository instead of a local one, the process will take nearly an hour, even though there are fewer than 100 commits.
  Subversion has to clone one revision at a time and then push it back into another repository – it's ridiculously inefficient, but it's the only easy way to do this.
-@@ -46,9 +80,29 @@
+@@ -48,9 +80,29 @@
  You'll start with the `git svn clone` command, which imports an entire Subversion repository into a local Git repository.
  Remember that if you're importing from a real hosted Subversion repository, you should replace the `file:///tmp/test-svn` here with the URL of your Subversion repository:
  
@@ -16346,7 +16315,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  For a project with hundreds or thousands of commits, this can literally take hours or even days to finish.
  
  The `-T trunk -b branches -t tags` part tells Git that this Subversion repository follows the basic branching and tagging conventions.
-@@ -56,30 +110,101 @@
+@@ -58,30 +110,101 @@
  Because this is so common, you can replace this entire part with `-s`, which means standard layout and implies all those options.
  The following command is equivalent:
  
@@ -16450,7 +16419,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  Notice that the SHA-1 checksum that originally started with `4af61fd` when you committed now begins with `95e0222`.
  If you want to push to both a Git server and a Subversion server, you have to push (`dcommit`) to the Subversion server first, because that action changes your commit data.
  
-@@ -89,13 +214,75 @@
+@@ -91,13 +214,75 @@
  That change will be rejected until you merge in their work.
  In `git svn`, it looks like this:
  
@@ -16526,7 +16495,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  This is important to remember, because the outcome is a project state that didn't exist on either of your computers when you pushed.
  If the changes are incompatible but don't conflict, you may get issues that are difficult to diagnose.
  This is different than using a Git server – in Git, you can fully test the state on your client system before publishing it, whereas in SVN, you can't ever be certain that the states immediately before commit and after commit are identical.
-@@ -103,6 +290,15 @@
+@@ -105,6 +290,15 @@
  You should also run this command to pull in changes from the Subversion server, even if you're not ready to commit yourself.
  You can run `git svn fetch` to grab the new data, but `git svn rebase` does the fetch and then updates your local commits.
  
@@ -16542,7 +16511,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  Running `git svn rebase` every once in a while makes sure your code is always up to date.
  You need to be sure your working directory is clean when you run this, though.
  If you have local changes, you must either stash your work or temporarily commit it before running `git svn rebase` – otherwise, the command will stop if it sees that the rebase will result in a merge conflict.
-@@ -116,6 +312,24 @@
+@@ -118,6 +312,24 @@
  Suppose your history looks like the following: you created an `experiment` branch, did two commits, and then merged them back into `master`.
  When you `dcommit`, you see output like this:
  
@@ -16567,7 +16536,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  Running `dcommit` on a branch with merged history works fine, except that when you look at your Git project history, it hasn't rewritten either of the commits you made on the `experiment` branch – instead, all those changes appear in the SVN version of the single merge commit.
  
  When someone else clones that work, all they see is the merge commit with all the work squashed into it, as though you ran `git merge --squash`; they don't see the commit data about where it came from or when it was committed.
-@@ -123,11 +337,22 @@
+@@ -125,11 +337,22 @@
  ===== Subversion Branching
  
  Branching in Subversion isn't the same as branching in Git; if you can avoid using it much, that's probably best.
@@ -16592,7 +16561,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  
  This does the equivalent of the `svn copy trunk branches/opera` command in Subversion and operates on the Subversion server.
  It's important to note that it doesn't check you out into that branch; if you commit at this point, that commit will go to `trunk` on the server, not `opera`.
-@@ -137,7 +362,12 @@
+@@ -139,7 +362,12 @@
  Git figures out what branch your dcommits go to by looking for the tip of any of your Subversion branches in your history – you should have only one, and it should be the last one with a `git-svn-id` in your current branch history.
  
  If you want to work on more than one branch simultaneously, you can set up local branches to `dcommit` to specific Subversion branches by starting them at the imported Subversion commit for that branch.
@@ -16606,7 +16575,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  
  Now, if you want to merge your `opera` branch into `trunk` (your `master` branch), you can do so with a normal `git merge`.
  But you need to provide a descriptive commit message (via `-m`), or the merge will say ``Merge branch opera'' instead of something useful.
-@@ -145,7 +375,7 @@
+@@ -147,7 +375,7 @@
  Remember that although you're using `git merge` to do this operation, and the merge likely will be much easier than it would be in Subversion (because Git will automatically detect the appropriate merge base for you), this isn't a normal Git merge commit.
  You have to push this data back to a Subversion server that can't handle a commit that tracks more than one parent; so, after you push it up, it will look like a single commit that squashed in all the work of another branch under a single commit.
  After you merge one branch into another, you can't easily go back and continue working on that branch, as you normally can in Git.
@@ -16615,7 +16584,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  Unfortunately, there's no good way to avoid this situation – Subversion can't store this information, so you'll always be crippled by its limitations while you're using it as your server.
  To avoid issues, you should delete the local branch (in this case, `opera`) after you merge it into trunk.
  
-@@ -158,6 +388,25 @@
+@@ -160,6 +388,25 @@
  
  If you're used to Subversion and want to see your history in SVN output style, you can run `git svn log` to view your commit history in SVN formatting:
  
@@ -16641,7 +16610,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  You should know two important things about `git svn log`.
  First, it works offline, unlike the real `svn log` command, which asks the Subversion server for the data.
  Second, it only shows you commits that have been committed up to the Subversion server.
-@@ -169,12 +418,44 @@
+@@ -171,12 +418,44 @@
  Much as the `git svn log` command simulates the `svn log` command offline, you can get the equivalent of `svn annotate` by running `git svn blame [FILE]`.
  The output looks like this:
  
@@ -16686,7 +16655,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  This is like `blame` and `log` in that it runs offline and is up to date only as of the last time you communicated with the Subversion server.
  
  ====== Ignoring What Subversion Ignores
-@@ -185,6 +466,11 @@
+@@ -187,6 +466,11 @@
  
  The second command is `git svn show-ignore`, which prints to stdout the lines you need to put in a `.gitignore` file so you can redirect the output into your project exclude file:
  
@@ -16700,7 +16669,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
  
 Warning: file not found: ../../git/progit2/progit2-ja/book/09-git-and-other-scms/sections/import-bzr.asc
 diff -au /tmp/book/09-git-and-other-scms/sections/import-custom.asc.tmp ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-custom.asc
---- /tmp/book/09-git-and-other-scms/sections/import-custom.asc.tmp	2020-10-25 11:05:02.458651488 +0900
+--- /tmp/book/09-git-and-other-scms/sections/import-custom.asc.tmp	2020-10-25 13:21:07.115952004 +0900
 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-custom.asc	2020-06-28 16:44:50.946018445 +0900
 @@ -1,4 +1,4 @@
 -[[r_custom_importer]]
@@ -16708,7 +16677,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/import-custom.asc.tmp ../../gi
  ==== A Custom Importer
  
  (((git commands, fast-import)))
-@@ -14,82 +14,359 @@
+@@ -14,85 +14,359 @@
  Suppose you work in `current`, you back up your project by occasionally copying the directory into a time-stamped `back_YYYY_MM_DD` backup directory, and you want to import this into Git.
  Your directory structure looks like this:
  
@@ -16890,18 +16859,18 @@ diff -au /tmp/book/09-git-and-other-scms/sections/import-custom.asc.tmp ../../gi
 +----
 +
 +[NOTE]
-+====
+ ====
  If you are running on Windows you'll need to make sure that you add one extra step.
 -As mentioned before, Windows uses CRLF for new line characters while git fast-import expects only LF.
 -To get around this problem and make git fast-import happy, you need to tell ruby to use LF instead of CRLF:
 +As mentioned before, Windows uses CRLF for new line characters while `git fast-import` expects only LF.
 +To get around this problem and make `git fast-import` happy, you need to tell ruby to use LF instead of CRLF:
-+
+ 
 +[source,ruby]
 +----
 +$stdout.binmode
 +----
-+====
+ ====
  
  That's it.
  Here's the script in its entirety:
@@ -17073,7 +17042,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/import-custom.asc.tmp ../../gi
  You can do a lot more with the `fast-import` tool – handle different modes, binary data, multiple branches and merging, tags, progress indicators, and more.
  A number of examples of more complex scenarios are available in the `contrib/fast-import` directory of the Git source code.
 diff -au /tmp/book/09-git-and-other-scms/sections/import-hg.asc.tmp ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-hg.asc
---- /tmp/book/09-git-and-other-scms/sections/import-hg.asc.tmp	2020-10-25 11:05:02.463651769 +0900
+--- /tmp/book/09-git-and-other-scms/sections/import-hg.asc.tmp	2020-10-25 13:21:07.124952483 +0900
 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-hg.asc	2020-06-28 16:44:50.947018592 +0900
 @@ -3,25 +3,122 @@
  (((Mercurial)))(((Importing, from Mercurial)))
@@ -17201,19 +17170,17 @@ diff -au /tmp/book/09-git-and-other-scms/sections/import-hg.asc.tmp ../../git/pr
 +$ git push origin --all
 +----
 diff -au /tmp/book/09-git-and-other-scms/sections/import-p4.asc.tmp ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-p4.asc
---- /tmp/book/09-git-and-other-scms/sections/import-p4.asc.tmp	2020-10-25 11:05:02.468652050 +0900
+--- /tmp/book/09-git-and-other-scms/sections/import-p4.asc.tmp	2020-10-25 13:21:07.136953121 +0900
 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-p4.asc	2020-06-28 16:44:50.947018592 +0900
-@@ -1,38 +1,102 @@
+@@ -1,4 +1,4 @@
 -[[r_perforce_import]]
 +[[_perforce_import]]
  ==== Perforce
  
  (((Perforce)))(((Importing, from Perforce)))
- The next system you'll look at importing from is Perforce.
- As we discussed above, there are two ways to let Git and Perforce talk to each other: git-p4 and Perforce Git Fusion.
+@@ -8,38 +8,95 @@
+ ===== Perforce Git Fusion
  
-+===== Perforce Git Fusion
-+
  Git Fusion makes this process fairly painless.
 -Just configure your project settings, user mappings, and branches using a configuration file (as discussed in <<r_p4_git_fusion>>), and clone the repository.
 +Just configure your project settings, user mappings, and branches using a configuration file (as discussed in <<_p4_git_fusion>>), and clone the repository.
@@ -17223,6 +17190,8 @@ diff -au /tmp/book/09-git-and-other-scms/sections/import-p4.asc.tmp ../../git/pr
 +[[_git_p4]]
  ===== Git-p4
  
+-===== git-p4
+-
  Git-p4 can also act as an import tool.
  As an example, we'll import the Jam project from the Perforce Public Depot.
  To set up your client, you must export the P4PORT environment variable to point to the Perforce depot:
@@ -17233,10 +17202,11 @@ diff -au /tmp/book/09-git-and-other-scms/sections/import-p4.asc.tmp ../../git/pr
 +----
 +
 +[NOTE]
-+====
+ ====
  In order to follow along, you'll need a Perforce depot to connect with.
  We'll be using the public depot at public.perforce.com for our examples, but you can use any depot you have access to.
-+====
+-
+ ====
  
 +(((git commands, p4)))
  Run the `git p4 clone` command to import the Jam project from the Perforce server, supplying the depot and project path and the path into which you want to import the project:
@@ -17310,7 +17280,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/import-p4.asc.tmp ../../git/pr
 +
  Your import is ready to push up to your new Git server.
 diff -au /tmp/book/09-git-and-other-scms/sections/import-svn.asc.tmp ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-svn.asc
---- /tmp/book/09-git-and-other-scms/sections/import-svn.asc.tmp	2020-10-25 11:05:02.473652332 +0900
+--- /tmp/book/09-git-and-other-scms/sections/import-svn.asc.tmp	2020-10-25 13:21:07.146953653 +0900
 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-svn.asc	2020-07-04 16:36:46.743685694 +0900
 @@ -12,21 +12,76 @@
  If you want to map this to better Git author data, you need a mapping from the Subversion users to the Git authors.
@@ -17451,7 +17421,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/import-svn.asc.tmp ../../git/p
 +
  All your branches and tags should be on your new Git server in a nice, clean import.
 diff -au /tmp/book/10-git-internals/sections/environment.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/environment.asc
---- /tmp/book/10-git-internals/sections/environment.asc.tmp	2020-10-25 11:05:02.479652669 +0900
+--- /tmp/book/10-git-internals/sections/environment.asc.tmp	2020-10-25 13:21:07.155954132 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/environment.asc	2020-07-01 10:48:37.623009671 +0900
 @@ -4,6 +4,7 @@
  Occasionally, it comes in handy to know what these are, and how they can be used to make Git behave the way you want it to.
@@ -17478,12 +17448,14 @@ diff -au /tmp/book/10-git-internals/sections/environment.asc.tmp ../../git/progi
  
  *`GIT_INDEX_FILE`* is the path to the index file (non-bare repositories only).
  
-@@ -46,12 +48,13 @@
+@@ -46,14 +48,13 @@
  *`GIT_ALTERNATE_OBJECT_DIRECTORIES`* is a colon-separated list (formatted like `/dir/one:/dir/two:…`) which tells Git where to check for objects if they aren't in `GIT_OBJECT_DIRECTORY`.
  If you happen to have a lot of projects with large files that have the exact same contents, this can be used to avoid storing too many copies of them.
  
-+
- ==== Pathspecs
+-==== Pathspecs
+ 
+-==== Pathspec
++==== Pathspecs
  
  A ``pathspec'' refers to how you specify paths to things in Git, including the use of wildcards.
  These are used in the `.gitignore` file, but also on the command-line (`git add *.c`).
@@ -17493,7 +17465,7 @@ diff -au /tmp/book/10-git-internals/sections/environment.asc.tmp ../../git/progi
  If `GIT_GLOB_PATHSPECS` is set to 1, wildcard characters act as wildcards (which is the default); if `GIT_NOGLOB_PATHSPECS` is set to 1, wildcard characters only match themselves, meaning something like `*.c` would only match a file _named_ ``*.c'', rather than any file whose name ends with `.c`.
  You can override this in individual cases by starting the pathspec with `:(glob)` or `:(literal)`, as in `:(glob)*.c`.
  
-@@ -59,6 +62,7 @@
+@@ -61,6 +62,7 @@
  
  *`GIT_ICASE_PATHSPECS`* sets all pathspecs to work in a case-insensitive manner.
  
@@ -17501,7 +17473,7 @@ diff -au /tmp/book/10-git-internals/sections/environment.asc.tmp ../../git/progi
  ==== Committing
  
  The final creation of a Git commit object is usually done by `git-commit-tree`, which uses these environment variables as its primary source of information, falling back to configuration values only if these aren't present.
-@@ -78,6 +82,7 @@
+@@ -80,6 +82,7 @@
  *`EMAIL`* is the fallback email address in case the `user.email` configuration value isn't set.
  If _this_ isn't set, Git falls back to the system user and host names.
  
@@ -17509,7 +17481,7 @@ diff -au /tmp/book/10-git-internals/sections/environment.asc.tmp ../../git/progi
  ==== Networking
  
  Git uses the `curl` library to do network operations over HTTP, so *`GIT_CURL_VERBOSE`* tells Git to emit all the messages generated by that library.
-@@ -86,12 +91,14 @@
+@@ -88,12 +91,14 @@
  *`GIT_SSL_NO_VERIFY`* tells Git not to verify SSL certificates.
  This can sometimes be necessary if you're using a self-signed certificate to serve Git repositories over HTTPS, or you're in the middle of setting up a Git server but haven't installed a full certificate yet.
  
@@ -17524,7 +17496,7 @@ diff -au /tmp/book/10-git-internals/sections/environment.asc.tmp ../../git/progi
  ==== Diffing and Merging
  
  *`GIT_DIFF_OPTS`* is a bit of a misnomer.
-@@ -127,16 +134,84 @@
+@@ -129,16 +134,84 @@
  *`GIT_TRACE`* controls general traces, which don't fit into any specific category.
  This includes the expansion of aliases, and delegation to other sub-programs.
  
@@ -17610,7 +17582,7 @@ diff -au /tmp/book/10-git-internals/sections/environment.asc.tmp ../../git/progi
  ==== Miscellaneous
  
  *`GIT_SSH`*, if specified, is a program that is invoked instead of `ssh` when Git tries to connect to an SSH host.
-@@ -145,8 +220,7 @@
+@@ -147,8 +220,7 @@
  It's probably easier just to use the `~/.ssh/config` file for that.
  
  *`GIT_ASKPASS`* is an override for the `core.askpass` configuration value.
@@ -17620,7 +17592,7 @@ diff -au /tmp/book/10-git-internals/sections/environment.asc.tmp ../../git/progi
  
  *`GIT_NAMESPACE`* controls access to namespaced refs, and is equivalent to the `--namespace` flag.
  This is mostly useful on the server side, where you may want to store multiple forks of a single repository in one repository, only keeping the refs separate.
-@@ -157,3 +231,11 @@
+@@ -159,3 +231,11 @@
  
  *`GIT_REFLOG_ACTION`* lets you specify the descriptive text written to the reflog.
  Here's an example:
@@ -17633,7 +17605,7 @@ diff -au /tmp/book/10-git-internals/sections/environment.asc.tmp ../../git/progi
 +9e3d55a HEAD@{0}: my action: My message
 +----
 diff -au /tmp/book/10-git-internals/sections/maintenance.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/maintenance.asc
---- /tmp/book/10-git-internals/sections/maintenance.asc.tmp	2020-10-25 11:05:02.485653007 +0900
+--- /tmp/book/10-git-internals/sections/maintenance.asc.tmp	2020-10-25 13:21:07.164954610 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/maintenance.asc	2020-06-28 16:44:50.948018739 +0900
 @@ -3,6 +3,7 @@
  Occasionally, you may have to do some cleanup – make a repository more compact, clean up an imported repository, or recover lost work.
@@ -17972,9 +17944,9 @@ diff -au /tmp/book/10-git-internals/sections/maintenance.asc.tmp ../../git/progi
 +size-garbage: 0
 +----
 diff -au /tmp/book/10-git-internals/sections/objects.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/objects.asc
---- /tmp/book/10-git-internals/sections/objects.asc.tmp	2020-10-25 11:05:02.492653400 +0900
+--- /tmp/book/10-git-internals/sections/objects.asc.tmp	2020-10-25 13:21:07.175955196 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/objects.asc	2020-07-04 16:36:46.743685694 +0900
-@@ -1,148 +1,438 @@
+@@ -1,159 +1,438 @@
 -[[r_objects]]
 +[[_objects]]
  === Git Objects
@@ -18007,7 +17979,11 @@ diff -au /tmp/book/10-git-internals/sections/objects.asc.tmp ../../git/progit2/p
  Git has initialized the `objects` directory and created `pack` and `info` subdirectories in it, but there are no regular files.
 -Now, store some text in your Git database:
 +Now, let's use `git hash-object` to create a new data object and manually store it in your new Git database:
-+
+ 
+-The `-w` tells `hash-object` to store the object; otherwise, the command simply tells you what the key would be.
+-`--stdin` tells the command to read the content from stdin; if you don't specify this, `hash-object` expects a file path at the end.
+-The output from the command is a 40-character checksum hash.
+-This is the SHA-1 hash – a checksum of the content you're storing plus a header, which you'll learn about in a bit.
 +[source,console]
 +----
 +$ echo 'test content' | git hash-object -w --stdin
@@ -18017,11 +17993,7 @@ diff -au /tmp/book/10-git-internals/sections/objects.asc.tmp ../../git/progit2/p
 +In its simplest form, `git hash-object` would take the content you handed to it and merely return the unique key that _would_ be used to store it in your Git database.
 +The `-w` option then tells the command to not simply return the key, but to write that object to the database.
 +Finally, the `--stdin` option tells `git hash-object` to get the content to be processed from stdin; otherwise, the command would expect a filename argument at the end of the command containing the content to be used.
- 
--The `-w` tells `hash-object` to store the object; otherwise, the command simply tells you what the key would be.
--`--stdin` tells the command to read the content from stdin; if you don't specify this, `hash-object` expects a file path at the end.
--The output from the command is a 40-character checksum hash.
--This is the SHA-1 hash – a checksum of the content you're storing plus a header, which you'll learn about in a bit.
++
 +The output from the above command is a 40-character checksum hash.
 +This is the SHA-1 hash -- a checksum of the content you're storing plus a header, which you'll learn about in a bit.
  Now you can see how Git has stored your data:
@@ -18285,11 +18257,11 @@ diff -au /tmp/book/10-git-internals/sections/objects.asc.tmp ../../git/progit2/p
 +tree d8329fc1cc938780ffdd9f94e0d364e0ea74f579
 +author Scott Chacon <[e-mail]> 1243040974 -0700
 +committer Scott Chacon <[e-mail]> 1243040974 -0700
-+
-+First commit
-+----
  
 -The format for a commit object is simple: it specifies the top-level tree for the snapshot of the project at that point; the author/committer information (which uses your `user.name` and `user.email` configuration settings and a timestamp); a blank line, and then the commit message.
++First commit
++----
++
 +The format for a commit object is simple: it specifies the top-level tree for the snapshot of the project at that point; the parent commits if any (the commit object described above does not have any parents); the author/committer information (which uses your `user.name` and `user.email` configuration settings and a timestamp); a blank line, and then the commit message.
  
  Next, you'll write the other two commit objects, each referencing the commit that came directly before it:
@@ -18378,35 +18350,35 @@ diff -au /tmp/book/10-git-internals/sections/objects.asc.tmp ../../git/progit2/p
  
  You can start up interactive Ruby mode with the `irb` command:
  
--Git constructs a header that starts with the type of the object, in this case a blob.
--Then, it adds a space followed by the size of the content and finally a null byte:
 +[source,console]
 +----
 +$ irb
 +>> content = "what is up, doc?"
-+=> "what is up, doc?"
+ => "what is up, doc?"
+-Git constructs a header that starts with the type of the object, in this case a blob.
+-Then, it adds a space followed by the size of the content and finally a null byte:
 +----
 +
 +Git first constructs a header which starts by identifying the type of object -- in this case, a blob.
 +To that first part of the header, Git adds a space followed by the size in bytes  of the content, and adding a final null byte:
-+
+ 
 +[source,console]
 +----
 +>> header = "blob #{content.bytesize}\0"
-+=> "blob 16\u0000"
+ => "blob 16\u0000"
 +----
- 
++
  Git concatenates the header and the original content and then calculates the SHA-1 checksum of that new content.
  You can calculate the SHA-1 value of a string in Ruby by including the SHA1 digest library with the `require` command and then calling `Digest::SHA1.hexdigest()` with the string:
  
 +[source,console]
 +----
 +>> store = header + content
-+=> "blob 16\u0000what is up, doc?"
+ => "blob 16\u0000what is up, doc?"
 +>> require 'digest/sha1'
-+=> true
+ => true
 +>> sha1 = Digest::SHA1.hexdigest(store)
-+=> "bd9dbf5aae1a3862dd1526723246b20206e5fc37"
+ => "bd9dbf5aae1a3862dd1526723246b20206e5fc37"
 +----
 +
 +Let's compare that to the output of `git hash-object`.
@@ -18424,9 +18396,9 @@ diff -au /tmp/book/10-git-internals/sections/objects.asc.tmp ../../git/progit2/p
 +[source,console]
 +----
 +>> require 'zlib'
-+=> true
+ => true
 +>> zlib_content = Zlib::Deflate.deflate(store)
-+=> "x\x9CK\xCA\xC9OR04c(\xCFH,Q\xC8,V(-\xD0QH\xC9O\xB6\a\x00_\x1C\a\x9D"
+ => "x\x9CK\xCA\xC9OR04c(\xCFH,Q\xC8,V(-\xD0QH\xC9O\xB6\a\x00_\x1C\a\x9D"
 +----
 +
  Finally, you'll write your zlib-deflated content to an object on disk.
@@ -18437,13 +18409,13 @@ diff -au /tmp/book/10-git-internals/sections/objects.asc.tmp ../../git/progit2/p
 +[source,console]
 +----
 +>> path = '.git/objects/' + sha1[0,2] + '/' + sha1[2,38]
-+=> ".git/objects/bd/9dbf5aae1a3862dd1526723246b20206e5fc37"
+ => ".git/objects/bd/9dbf5aae1a3862dd1526723246b20206e5fc37"
 +>> require 'fileutils'
-+=> true
+ => true
 +>> FileUtils.mkdir_p(File.dirname(path))
-+=> ".git/objects/bd"
+ => ".git/objects/bd"
 +>> File.open(path, 'w') { |f| f.write zlib_content }
-+=> 32
+ => 32
 +----
 +
 +Let's check the content of the object using `git cat-file`:
@@ -18459,22 +18431,16 @@ diff -au /tmp/book/10-git-internals/sections/objects.asc.tmp ../../git/progit2/p
  All Git objects are stored the same way, just with different types – instead of the string blob, the header will begin with commit or tree.
  Also, although the blob content can be nearly anything, the commit and tree content are very specifically formatted.
 diff -au /tmp/book/10-git-internals/sections/packfiles.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/packfiles.asc
---- /tmp/book/10-git-internals/sections/packfiles.asc.tmp	2020-10-25 11:05:02.498653738 +0900
+--- /tmp/book/10-git-internals/sections/packfiles.asc.tmp	2020-10-25 13:21:07.184955674 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/packfiles.asc	2020-06-28 16:44:50.948018739 +0900
-@@ -1,23 +1,87 @@
+@@ -1,25 +1,87 @@
  === Packfiles
  
--Let's go back to the objects database for your test Git repository.
--At this point, you have 11 objects – 4 blobs, 3 trees, 3 commits, and 1 tag:
+-=== Packfile
 +If you followed all of the instructions in the example from the previous section, you should now have a test Git repository with 11 objects -- four blobs, three trees, three commits, and one tag:
  
--Git compresses the contents of these files with zlib, and you're not storing much, so all these files collectively take up only 925 bytes.
--You'll add some larger content to the repository to demonstrate an interesting feature of Git.
--To demonstrate, we'll add the `repo.rb` file from the Grit library – this is about a 22K source code file:
--
--If you look at the resulting tree, you can see the SHA-1 value your repo.rb file got for the blob object:
--
--You can then use `git cat-file` to see how big that object is:
+-Let's go back to the objects database for your test Git repository.
+-At this point, you have 11 objects – 4 blobs, 3 trees, 3 commits, and 1 tag:
 +[source,console]
 +----
 +$ find .git/objects -type f
@@ -18491,11 +18457,18 @@ diff -au /tmp/book/10-git-internals/sections/packfiles.asc.tmp ../../git/progit2
 +.git/objects/fd/f4fc3344e67ab068f836878b6c4951e3b15f3d # commit 1
 +----
  
--Now, modify that file a little, and see what happens:
-+Git compresses the contents of these files with zlib, and you're not storing much, so all these files collectively take up only 925 bytes.
+ Git compresses the contents of these files with zlib, and you're not storing much, so all these files collectively take up only 925 bytes.
+-You'll add some larger content to the repository to demonstrate an interesting feature of Git.
+-To demonstrate, we'll add the `repo.rb` file from the Grit library – this is about a 22K source code file:
 +Now you'll add some more sizable content to the repository to demonstrate an interesting feature of Git.
 +To demonstrate, we'll add the `repo.rb` file from the Grit library -- this is about a 22K source code file:
  
+-If you look at the resulting tree, you can see the SHA-1 value your repo.rb file got for the blob object:
+-
+-You can then use `git cat-file` to see how big that object is:
+-
+-Now, modify that file a little, and see what happens:
+-
 -Check the tree created by that commit, and you see something interesting:
 +[source,console]
 +----
@@ -18561,7 +18534,7 @@ diff -au /tmp/book/10-git-internals/sections/packfiles.asc.tmp ../../git/progit2
  Wouldn't it be nice if Git could store one of them in full but then the second object only as the delta between it and the first?
  
  It turns out that it can.
-@@ -26,25 +90,74 @@
+@@ -28,25 +90,74 @@
  Git does this if you have too many loose objects around, if you run the `git gc` command manually, or if you push to a remote server.
  To see what happens, you can manually ask Git to pack up the objects by calling the `git gc` command:
  
@@ -18643,7 +18616,7 @@ diff -au /tmp/book/10-git-internals/sections/packfiles.asc.tmp ../../git/progit2
  The really nice thing about this is that it can be repacked at any time.
  Git will occasionally repack your database automatically, always trying to save more space, but you can also manually repack at any time by running `git gc` by hand.
 diff -au /tmp/book/10-git-internals/sections/plumbing-porcelain.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/plumbing-porcelain.asc
---- /tmp/book/10-git-internals/sections/plumbing-porcelain.asc.tmp	2020-10-25 11:05:02.503654019 +0900
+--- /tmp/book/10-git-internals/sections/plumbing-porcelain.asc.tmp	2020-10-25 13:21:07.193956153 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/plumbing-porcelain.asc	2020-06-28 16:44:50.950019034 +0900
 @@ -1,25 +1,37 @@
 -[[r_plumbing_porcelain]]
@@ -18696,9 +18669,9 @@ diff -au /tmp/book/10-git-internals/sections/plumbing-porcelain.asc.tmp ../../gi
 +The `objects` directory stores all the content for your database, the `refs` directory stores pointers into commit objects in that data (branches, tags, remotes and more), the `HEAD` file points to the branch you currently have checked out, and the `index` file is where Git stores your staging area information.
  You'll now look at each of these sections in detail to see how Git operates.
 diff -au /tmp/book/10-git-internals/sections/refs.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/refs.asc
---- /tmp/book/10-git-internals/sections/refs.asc.tmp	2020-10-25 11:05:02.508654300 +0900
+--- /tmp/book/10-git-internals/sections/refs.asc.tmp	2020-10-25 13:21:07.201956579 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/refs.asc	2020-07-04 16:36:46.743685694 +0900
-@@ -1,76 +1,182 @@
+@@ -1,78 +1,182 @@
 -[[r_git_refs]]
 +[[_git_refs]]
  === Git References
@@ -18777,6 +18750,8 @@ diff -au /tmp/book/10-git-internals/sections/refs.asc.tmp ../../git/progit2/prog
 +[[ref_the_ref]]
  ==== The HEAD
  
+-==== HEAD
+-
 -The question now is, when you run `git branch (branchname)`, how does Git know the SHA-1 of the last commit?
 +The question now is, when you run `git branch <branch>`, how does Git know the SHA-1 of the last commit?
  The answer is the HEAD file.
@@ -18903,7 +18878,7 @@ diff -au /tmp/book/10-git-internals/sections/refs.asc.tmp ../../git/progit2/prog
  
  ==== Remotes
  
-@@ -78,8 +184,26 @@
+@@ -80,8 +184,26 @@
  If you add a remote and push to it, Git stores the value you last pushed to that remote for each branch in the `refs/remotes` directory.
  For instance, you can add a remote called `origin` and push your `master` branch to it:
  
@@ -18931,13 +18906,15 @@ diff -au /tmp/book/10-git-internals/sections/refs.asc.tmp ../../git/progit2/prog
  You can `git checkout` to one, but Git won't point HEAD at one, so you'll never update it with a `commit` command.
  Git manages them as bookmarks to the last known state of where those branches were on those servers.
 diff -au /tmp/book/10-git-internals/sections/refspec.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/refspec.asc
---- /tmp/book/10-git-internals/sections/refspec.asc.tmp	2020-10-25 11:05:02.513654581 +0900
+--- /tmp/book/10-git-internals/sections/refspec.asc.tmp	2020-10-25 13:21:07.208956951 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/refspec.asc	2020-07-04 16:36:46.743685694 +0900
-@@ -1,54 +1,145 @@
+@@ -1,56 +1,145 @@
 -[[r_refspec]]
 +[[_refspec]]
  === The Refspec
  
+-=== Refspec
+-
  Throughout this book, we've used simple mappings from remote branches to local references, but they can be more complex.
 -Suppose you add a remote like this:
 +Suppose you were following along with the last couple sections and had created a small local Git repository, and now wanted to add a _remote_ to it:
@@ -19094,9 +19071,9 @@ diff -au /tmp/book/10-git-internals/sections/refspec.asc.tmp ../../git/progit2/p
 +$ git push origin --delete topic
 +----
 diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/transfer-protocols.asc
---- /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp	2020-10-25 11:05:02.519654919 +0900
+--- /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp	2020-10-25 13:21:07.217957430 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/transfer-protocols.asc	2020-06-28 16:44:50.950019034 +0900
-@@ -8,6 +8,7 @@
+@@ -8,58 +8,117 @@
  If you're setting up a repository to be served read-only over HTTP, the dumb protocol is likely what will be used.
  This protocol is called ``dumb'' because it requires no Git-specific code on the server side during the transport process; the fetch process is a series of HTTP `GET` requests, where the client can assume the layout of the Git repository on the server.
  
@@ -19104,8 +19081,12 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  ====
  The dumb protocol is fairly rarely used these days.
  It's difficult to secure or make private, so most Git hosts (both cloud-based and on-premises) will refuse to use it.
-@@ -16,38 +17,108 @@
+ It's generally advised to use the smart protocol, which we describe a bit further on.
+ ====
  
+-====
+-====
+-
  Let's follow the `http-fetch` process for the simplegit library:
  
 +[source,console]
@@ -19118,7 +19099,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  
 +[source]
 +----
-+=> GET info/refs
+ => GET info/refs
 +ca82a6dff817ec66f44342007202690a93763949     refs/heads/master
 +----
 +
@@ -19127,7 +19108,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  
 +[source]
 +----
-+=> GET HEAD
+ => GET HEAD
 +ref: refs/heads/master
 +----
 +
@@ -19137,7 +19118,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  
 +[source]
 +----
-+=> GET objects/ca/82a6dff817ec66f44342007202690a93763949
+ => GET objects/ca/82a6dff817ec66f44342007202690a93763949
 +(179 bytes of binary data)
 +----
 +
@@ -19159,7 +19140,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  
 +[source]
 +----
-+=> GET objects/08/5bb3bcb608e1e8451d4b2432f8ecbe6306e7e7
+ => GET objects/08/5bb3bcb608e1e8451d4b2432f8ecbe6306e7e7
 +(179 bytes of data)
 +----
 +
@@ -19168,7 +19149,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  
 +[source]
 +----
-+=> GET objects/cf/da3bf379e4f8dba8717dee55aab78aef7f4daf
+ => GET objects/cf/da3bf379e4f8dba8717dee55aab78aef7f4daf
 +(404 - Not Found)
 +----
 +
@@ -19178,7 +19159,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  
 +[source]
 +----
-+=> GET objects/info/http-alternates
+ => GET objects/info/http-alternates
 +(empty file)
 +----
 +
@@ -19188,7 +19169,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  
 +[source]
 +----
-+=> GET objects/info/packs
+ => GET objects/info/packs
 +P pack-816a9b2334da9953e530f27bcac22082a9f5b835.pack
 +----
 +
@@ -19197,7 +19178,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  
 +[source]
 +----
-+=> GET objects/pack/pack-816a9b2334da9953e530f27bcac22082a9f5b835.idx
+ => GET objects/pack/pack-816a9b2334da9953e530f27bcac22082a9f5b835.idx
 +(4k of binary data)
 +----
 +
@@ -19206,14 +19187,14 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  
 +[source]
 +----
-+=> GET objects/pack/pack-816a9b2334da9953e530f27bcac22082a9f5b835.pack
+ => GET objects/pack/pack-816a9b2334da9953e530f27bcac22082a9f5b835.pack
 +(13k of binary data)
 +----
 +
  You have your tree object, so you continue walking your commits.
  They're all also within the packfile you just downloaded, so you don't have to do any more requests to your server.
  Git checks out a working copy of the `master` branch that was pointed to by the HEAD reference you downloaded at the beginning.
-@@ -60,24 +131,47 @@
+@@ -72,6 +131,7 @@
  
  ===== Uploading Data
  
@@ -19221,9 +19202,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  To upload data to a remote process, Git uses the `send-pack` and `receive-pack` processes.
  The `send-pack` process runs on the client and connects to a `receive-pack` process on the remote side.
  
-+====== SSH
-+
- For example, say you run `git push origin master` in your project, and `origin` is defined as a URL that uses the SSH protocol.
+@@ -81,17 +141,37 @@
  Git fires up the `send-pack` process, which initiates a connection over SSH to your server.
  It tries to run a command on the remote server via an SSH call that looks something like this:
  
@@ -19264,7 +19243,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  Git sends a line for each reference you're updating with the line's length, the old SHA-1, the new SHA-1, and the reference that is being updated.
  The first line also has the client's capabilities.
  The SHA-1 value of all '0's means that nothing was there before – because you're adding the experiment reference.
-@@ -86,24 +180,66 @@
+@@ -100,21 +180,42 @@
  Next, the client sends a packfile of all the objects the server doesn't have yet.
  Finally, the server responds with a success (or failure) indication:
  
@@ -19273,14 +19252,14 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
 +000eunpack ok
 +----
 +
-+====== HTTP(S)
-+
+ ====== HTTP(S)
+ 
  This process is mostly the same over HTTP, though the handshaking is a bit different.
  The connection is initiated with this request:
  
 +[source]
 +----
-+=> GET http://server/simplegit-progit.git/info/refs?service=git-receive-pack
+ => GET http://server/simplegit-progit.git/info/refs?service=git-receive-pack
 +001f# service=git-receive-pack
 +00ab6c5f0e45abd7832bf23074a333f739977c9e8188 refs/heads/master□report-status \
 +	delete-refs side-band-64k quiet ofs-delta \
@@ -19293,7 +19272,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  
 +[source]
 +----
-+=> POST http://server/simplegit-progit.git/git-receive-pack
+ => POST http://server/simplegit-progit.git/git-receive-pack
 +----
 +
  The `POST` request includes the `send-pack` output and the packfile as its payload.
@@ -19307,8 +19286,8 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  When you download data, the `fetch-pack` and `upload-pack` processes are involved.
  The client initiates a `fetch-pack` process that connects to an `upload-pack` process on the remote side to negotiate what data will be transferred down.
  
-+====== SSH
-+
+@@ -122,8 +223,23 @@
+ 
  If you're doing the fetch over SSH, `fetch-pack` runs something like this:
  
 +[source,console]
@@ -19331,7 +19310,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  This is very similar to what `receive-pack` responds with, but the capabilities are different.
  In addition, it sends back what HEAD points to (`symref=HEAD:refs/heads/master`) so the client knows what to check out if this is a clone.
  
-@@ -111,11 +247,41 @@
+@@ -131,15 +247,41 @@
  It sends all the objects it already has with ``have'' and then the SHA-1.
  At the end of this list, it writes ``done'' to initiate the `upload-pack` process to begin sending the packfile of the data it needs:
  
@@ -19343,14 +19322,14 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
 +0000
 +----
 +
-+====== HTTP(S)
-+
+ ====== HTTP(S)
+ 
  The handshake for a fetch operation takes two HTTP requests.
  The first is a `GET` to the same endpoint used in the dumb protocol:
  
 +[source]
 +----
-+=> GET $GIT_URL/info/refs?service=git-upload-pack
+ => GET $GIT_URL/info/refs?service=git-upload-pack
 +001e# service=git-upload-pack
 +00e7ca82a6dff817ec66f44342007202690a93763949 HEAD□multi_ack thin-pack \
 +	side-band side-band-64k ofs-delta shallow no-progress include-tag \
@@ -19364,7 +19343,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  
 +[source]
 +----
-+=> POST $GIT_URL/git-upload-pack HTTP/1.0
+ => POST $GIT_URL/git-upload-pack HTTP/1.0
 +0032want 0a53e9ddeaddad63ad106860237bbf53411d11a7
 +0032have 441b40d833fdfa93eb2908e52742248faf0ee993
 +0000
@@ -19374,7 +19353,7 @@ diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../gi
  The response to this request indicates success or failure, and includes the packfile.
  
 diff -au /tmp/book/A-git-in-other-environments/sections/bash.asc.tmp ../../git/progit2/progit2/book/A-git-in-other-environments/sections/bash.asc
---- /tmp/book/A-git-in-other-environments/sections/bash.asc.tmp	2020-10-25 11:05:02.524655200 +0900
+--- /tmp/book/A-git-in-other-environments/sections/bash.asc.tmp	2020-10-25 13:21:07.228958015 +0900
 +++ ../../git/progit2/progit2/book/A-git-in-other-environments/sections/bash.asc	2020-07-04 16:36:46.743685694 +0900
 @@ -1,12 +1,23 @@
  === Git in Bash
@@ -19422,7 +19401,7 @@ diff -au /tmp/book/A-git-in-other-environments/sections/bash.asc.tmp ../../git/p
  
  Both of these scripts come with helpful documentation; take a look at the contents of `git-completion.bash` and `git-prompt.sh` for more information.
 diff -au /tmp/book/A-git-in-other-environments/sections/guis.asc.tmp ../../git/progit2/progit2/book/A-git-in-other-environments/sections/guis.asc
---- /tmp/book/A-git-in-other-environments/sections/guis.asc.tmp	2020-10-25 11:05:02.530655537 +0900
+--- /tmp/book/A-git-in-other-environments/sections/guis.asc.tmp	2020-10-25 13:21:07.236958440 +0900
 +++ ../../git/progit2/progit2/book/A-git-in-other-environments/sections/guis.asc	2020-07-04 16:36:46.743685694 +0900
 @@ -1,5 +1,6 @@
  === Graphical Interfaces
@@ -19509,8 +19488,13 @@ diff -au /tmp/book/A-git-in-other-environments/sections/guis.asc.tmp ../../git/p
  * On the right is a diff view, which shows what's changed in your working directory, or which changes were included in the selected commit.
  * The last thing to notice is the ``Sync'' button at the top-right, which is the primary way you interact over the network.
  
-@@ -87,12 +96,12 @@
+@@ -85,17 +94,14 @@
+ While they're designed to highlight GitHub's service and recommended workflow, they will happily work with any repository, and do network operations with any Git host.
+ ====
  
+-====
+-====
+-
  ===== Installation
  
 -GitHub for Windows can be downloaded from https://windows.github.com[], and GitHub for Mac from https://mac.github.com[].
@@ -19524,7 +19508,7 @@ diff -au /tmp/book/A-git-in-other-environments/sections/guis.asc.tmp ../../git/p
  
  The next step is to give the tool some repositories to work with.
  The client shows you a list of the repositories you have access to on GitHub, and can clone them in one step.
-@@ -102,18 +111,18 @@
+@@ -105,18 +111,18 @@
  
  Once it's installed and configured, you can use the GitHub client for many common Git tasks.
  The intended workflow for this tool is sometimes called the ``GitHub Flow.''
@@ -19549,7 +19533,7 @@ diff -au /tmp/book/A-git-in-other-environments/sections/guis.asc.tmp ../../git/p
  
  Once your branch is created, making new commits is fairly straightforward.
  Make some changes in your working directory, and when you switch to the GitHub client window, it will show you which files changed.
-@@ -135,8 +144,9 @@
+@@ -138,8 +144,9 @@
  Developers and non-developers alike can be collaborating on a project within minutes, and many of the best practices for this kind of workflow are baked into the tools.
  However, if your workflow is different, or you want more control over how and when network operations are done, we recommend you use another client or the command line.
  
@@ -19562,7 +19546,7 @@ diff -au /tmp/book/A-git-in-other-environments/sections/guis.asc.tmp ../../git/p
  A more comprehensive list is available on the Git wiki site, at https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools#Graphical_Interfaces[].
 Warning: file not found: ../../git/progit2/progit2-ja/book/A-git-in-other-environments/sections/jetbrainsides.asc
 diff -au /tmp/book/A-git-in-other-environments/sections/powershell.asc.tmp ../../git/progit2/progit2/book/A-git-in-other-environments/sections/powershell.asc
---- /tmp/book/A-git-in-other-environments/sections/powershell.asc.tmp	2020-10-25 11:05:02.535655818 +0900
+--- /tmp/book/A-git-in-other-environments/sections/powershell.asc.tmp	2020-10-25 13:21:07.246958972 +0900
 +++ ../../git/progit2/progit2/book/A-git-in-other-environments/sections/powershell.asc	2020-07-04 16:36:46.743685694 +0900
 @@ -1,16 +1,86 @@
 -[[r_git_powershell]]
@@ -19663,7 +19647,7 @@ diff -au /tmp/book/A-git-in-other-environments/sections/powershell.asc.tmp ../..
 +For more details on how to customize your posh-git prompt see: https://github.com/dahlbyk/posh-git/blob/master/README.md#customization-variables[].
 Warning: file not found: ../../git/progit2/progit2-ja/book/A-git-in-other-environments/sections/sublimetext.asc
 diff -au /tmp/book/A-git-in-other-environments/sections/visualstudio.asc.tmp ../../git/progit2/progit2/book/A-git-in-other-environments/sections/visualstudio.asc
---- /tmp/book/A-git-in-other-environments/sections/visualstudio.asc.tmp	2020-10-25 11:05:02.539656043 +0900
+--- /tmp/book/A-git-in-other-environments/sections/visualstudio.asc.tmp	2020-10-25 13:21:07.254959398 +0900
 +++ ../../git/progit2/progit2/book/A-git-in-other-environments/sections/visualstudio.asc	2020-07-13 09:35:20.947908596 +0900
 @@ -1,5 +1,6 @@
  === Git in Visual Studio
@@ -19700,7 +19684,7 @@ diff -au /tmp/book/A-git-in-other-environments/sections/visualstudio.asc.tmp ../
 +For more on using Git within Visual Studio go to: https://docs.microsoft.com/en-us/azure/devops/repos/git/command-prompt?view=azure-devops[].
 Warning: file not found: ../../git/progit2/progit2-ja/book/A-git-in-other-environments/sections/visualstudiocode.asc
 diff -au /tmp/book/A-git-in-other-environments/sections/zsh.asc.tmp ../../git/progit2/progit2/book/A-git-in-other-environments/sections/zsh.asc
---- /tmp/book/A-git-in-other-environments/sections/zsh.asc.tmp	2020-10-25 11:05:02.545656381 +0900
+--- /tmp/book/A-git-in-other-environments/sections/zsh.asc.tmp	2020-10-25 13:21:07.263959876 +0900
 +++ ../../git/progit2/progit2/book/A-git-in-other-environments/sections/zsh.asc	2020-07-04 16:36:46.743685694 +0900
 @@ -1,34 +1,55 @@
  === Git in Zsh
@@ -19773,9 +19757,9 @@ diff -au /tmp/book/B-embedding-git/sections/command-line.asc.tmp ../../git/progi
 Warning: file not found: ../../git/progit2/progit2-ja/book/B-embedding-git/sections/dulwich.asc
 Warning: file not found: ../../git/progit2/progit2-ja/book/B-embedding-git/sections/go-git.asc
 diff -au /tmp/book/B-embedding-git/sections/jgit.asc.tmp ../../git/progit2/progit2/book/B-embedding-git/sections/jgit.asc
---- /tmp/book/B-embedding-git/sections/jgit.asc.tmp	2020-10-25 11:05:02.555656943 +0900
+--- /tmp/book/B-embedding-git/sections/jgit.asc.tmp	2020-10-25 13:21:07.280960781 +0900
 +++ ../../git/progit2/progit2/book/B-embedding-git/sections/jgit.asc	2020-06-28 16:44:50.955019770 +0900
-@@ -1,27 +1,45 @@
+@@ -1,21 +1,36 @@
  === JGit
  
 -(((jgit)))(((java)))
@@ -19813,11 +19797,10 @@ diff -au /tmp/book/B-embedding-git/sections/jgit.asc.tmp ../../git/progit2/progi
 +java -cp .:org.eclipse.jgit-3.5.0.201409260305-r.jar App
 +----
 +
-+==== Plumbing
-+
- JGit has two basic levels of API: plumbing and porcelain.
- The terminology for these comes from Git itself, and JGit is divided into roughly the same kinds of areas: porcelain APIs are a friendly front-end for common user-level actions (the sorts of things a normal user would use the Git command-line tool for), while the plumbing APIs are for interacting with low-level repository objects directly.
+ ==== Plumbing
  
+ JGit has two basic levels of API: plumbing and porcelain.
+@@ -24,6 +39,7 @@
  The starting point for most JGit sessions is the `Repository` class, and the first thing you'll want to do is create an instance of it.
  For a filesystem-based repository (yes, JGit allows for other storage models), this is accomplished using `FileRepositoryBuilder`:
  
@@ -19825,7 +19808,7 @@ diff -au /tmp/book/B-embedding-git/sections/jgit.asc.tmp ../../git/progit2/progi
  ----
  // Create a new repository
  Repository newlyCreatedRepo = FileRepositoryBuilder.create(
-@@ -40,6 +58,7 @@
+@@ -42,6 +58,7 @@
  Once you have a `Repository` instance, you can do all sorts of things with it.
  Here's a quick sampling:
  
@@ -19833,7 +19816,7 @@ diff -au /tmp/book/B-embedding-git/sections/jgit.asc.tmp ../../git/progit2/progi
  ----
  // Get a reference
  Ref master = repo.getRef("master");
-@@ -72,13 +91,13 @@
+@@ -74,13 +91,13 @@
  There's quite a bit going on here, so let's go through it one section at a time.
  
  The first line gets a pointer to the `master` reference.
@@ -19849,12 +19832,7 @@ diff -au /tmp/book/B-embedding-git/sections/jgit.asc.tmp ../../git/progit2/progi
  
  The next two lines show how to load the raw contents of an object.
  In this example, we call `ObjectLoader.copyTo()` to stream the contents of the object directly to stdout, but ObjectLoader also has methods to read the type and size of an object, as well as return it as a byte array.
-@@ -96,9 +115,12 @@
- Also not shown here is the way JGit handles errors, which is through the use of exceptions.
- JGit APIs sometimes throw standard Java exceptions (such as `IOException`), but there are a host of JGit-specific exception types that are provided as well (such as `NoRemoteRepositoryException`, `CorruptObjectException`, and `NoMergeBaseException`).
- 
-+==== Porcelain
-+
+@@ -103,6 +120,7 @@
  The plumbing APIs are rather complete, but it can be cumbersome to string them together to achieve common goals, like adding a file to the index, or making a new commit.
  JGit provides a higher-level set of APIs to help out with this, and the entry point to these APIs is the `Git` class:
  
@@ -19862,7 +19840,7 @@ diff -au /tmp/book/B-embedding-git/sections/jgit.asc.tmp ../../git/progit2/progi
  ----
  Repository repo;
  // construct repo...
-@@ -106,7 +128,21 @@
+@@ -110,7 +128,21 @@
  ----
  
  The Git class has a nice set of high-level _builder_-style methods that can be used to construct some pretty complex behavior.
@@ -19885,7 +19863,7 @@ diff -au /tmp/book/B-embedding-git/sections/jgit.asc.tmp ../../git/progit2/progi
  
  This is a common pattern with the Git class; the methods return a command object that lets you chain method calls to set parameters, which are executed when you call `.call()`.
  In this case, we're asking the `origin` remote for tags, but not heads.
-@@ -119,7 +155,6 @@
+@@ -123,7 +155,6 @@
  This is only a small sampling of JGit's full capabilities.
  If you're interested and want to learn more, here's where to look for information and inspiration:
  
@@ -19895,7 +19873,7 @@ diff -au /tmp/book/B-embedding-git/sections/jgit.asc.tmp ../../git/progit2/progi
  * The JGit Cookbook at https://github.com/centic9/jgit-cookbook[] has many examples of how to do specific tasks with JGit.
 -* There are several good resources pointed out at http://stackoverflow.com/questions/6861881[].
 diff -au /tmp/book/B-embedding-git/sections/libgit2.asc.tmp ../../git/progit2/progit2/book/B-embedding-git/sections/libgit2.asc
---- /tmp/book/B-embedding-git/sections/libgit2.asc.tmp	2020-10-25 11:05:02.569657731 +0900
+--- /tmp/book/B-embedding-git/sections/libgit2.asc.tmp	2020-10-25 13:21:07.291961366 +0900
 +++ ../../git/progit2/progit2/book/B-embedding-git/sections/libgit2.asc	2020-07-01 10:48:37.625009675 +0900
 @@ -1,13 +1,15 @@
  === Libgit2
@@ -20059,12 +20037,10 @@ diff -au /tmp/book/B-embedding-git/sections/libgit2.asc.tmp ../../git/progit2/pr
  ==== Other Bindings
  
  Libgit2 has bindings for many languages.
-@@ -105,21 +186,43 @@
- The official collection of bindings can be found by browsing the repositories at https://github.com/libgit2[].
- The code we'll write will return the commit message from the commit eventually pointed to by HEAD (sort of like `git log -1`).
+@@ -107,25 +188,41 @@
+ 
+ ===== LibGit2Sharp
  
-+===== LibGit2Sharp
-+
 +(((.NET)))(((C#)))(((Mono)))
  If you're writing a .NET or Mono application, LibGit2Sharp (https://github.com/libgit2/libgit2sharp[]) is what you're looking for.
  The bindings are written in C#, and great care has been taken to wrap the raw Libgit2 calls with native-feeling CLR APIs.
@@ -20077,8 +20053,8 @@ diff -au /tmp/book/B-embedding-git/sections/libgit2.asc.tmp ../../git/progit2/pr
 +
  For desktop Windows applications, there's even a NuGet package that will help you get started quickly.
  
-+===== objective-git
-+
+ ===== objective-git
+ 
 +(((Apple)))(((Objective-C)))(((Cocoa)))
  If your application is running on an Apple platform, you're likely using Objective-C as your implementation language.
  Objective-Git (https://github.com/libgit2/objective-git[]) is the name of the Libgit2 bindings for that environment.
@@ -20093,9 +20069,9 @@ diff -au /tmp/book/B-embedding-git/sections/libgit2.asc.tmp ../../git/progit2/pr
 +
  Objective-git is fully interoperable with Swift, so don't fear if you've left Objective-C behind.
  
+ ===== pygit2
+ 
 -The bindings for Libgit2 in Python are called Pygit2, and can be found at http://www.pygit2.org/[].
-+===== pygit2
-+
 +(((Python)))
 +The bindings for Libgit2 in Python are called Pygit2, and can be found at https://www.pygit2.org[].
  Our example program:
@@ -20105,7 +20081,7 @@ diff -au /tmp/book/B-embedding-git/sections/libgit2.asc.tmp ../../git/progit2/pr
  pygit2.Repository("/path/to/repo") # open repository
      .head                          # get the current branch
 diff -au /tmp/book/contributors.asc.tmp ../../git/progit2/progit2/book/contributors.asc
---- /tmp/book/contributors.asc.tmp	2020-10-25 11:05:02.575658068 +0900
+--- /tmp/book/contributors.asc.tmp	2020-10-25 13:21:07.299961791 +0900
 +++ ../../git/progit2/progit2/book/contributors.asc	2020-06-28 16:44:50.955019770 +0900
 @@ -1,4 +1,12 @@
  [preface]
@@ -20122,7 +20098,7 @@ diff -au /tmp/book/contributors.asc.tmp ../../git/progit2/progit2/book/contribut
 +----
 +
 diff -au /tmp/book/dedication.asc.tmp ../../git/progit2/progit2/book/dedication.asc
---- /tmp/book/dedication.asc.tmp	2020-10-25 11:05:02.579658293 +0900
+--- /tmp/book/dedication.asc.tmp	2020-10-25 13:21:07.307962217 +0900
 +++ ../../git/progit2/progit2/book/dedication.asc	2020-06-28 16:44:50.960020506 +0900
 @@ -1,8 +1,8 @@
 -[preface]
@@ -20137,12 +20113,12 @@ diff -au /tmp/book/dedication.asc.tmp ../../git/progit2/progit2/book/dedication.
 +To my wife Jessica who has supported me for all of these years and to my daughter Josephine,
  who will support me when I'm too old to know what's going on. — Scott_
 diff -au /tmp/book/index.asc.tmp ../../git/progit2/progit2/book/index.asc
---- /tmp/book/index.asc.tmp	2020-10-25 11:05:02.584658574 +0900
+--- /tmp/book/index.asc.tmp	2020-10-25 13:21:07.317962749 +0900
 +++ ../../git/progit2/progit2/book/index.asc	2020-06-28 16:44:50.960020506 +0900
 @@ -0,0 +1 @@
 +== Index
 diff -au /tmp/book/introduction.asc.tmp ../../git/progit2/progit2/book/introduction.asc
---- /tmp/book/introduction.asc.tmp	2020-10-25 11:05:02.588658799 +0900
+--- /tmp/book/introduction.asc.tmp	2020-10-25 13:21:07.326963228 +0900
 +++ ../../git/progit2/progit2/book/introduction.asc	2020-06-28 16:44:50.960020506 +0900
 @@ -1,69 +1,58 @@
  [preface]
@@ -20267,7 +20243,7 @@ diff -au /tmp/book/introduction.asc.tmp ../../git/progit2/progit2/book/introduct
 -Let’s get started.
 +Let's get started.
 diff -au /tmp/book/license.asc.tmp ../../git/progit2/progit2/book/license.asc
---- /tmp/book/license.asc.tmp	2020-10-25 11:05:02.593659081 +0900
+--- /tmp/book/license.asc.tmp	2020-10-25 13:21:07.334963653 +0900
 +++ ../../git/progit2/progit2/book/license.asc	2020-06-28 16:44:50.961020654 +0900
 @@ -0,0 +1,4 @@
 +[preface]
@@ -20275,7 +20251,7 @@ diff -au /tmp/book/license.asc.tmp ../../git/progit2/progit2/book/license.asc
 +
 +include::../LICENSE.asc[]
 diff -au /tmp/book/preface_ben.asc.tmp ../../git/progit2/progit2/book/preface_ben.asc
---- /tmp/book/preface_ben.asc.tmp	2020-10-25 11:05:02.597659305 +0900
+--- /tmp/book/preface_ben.asc.tmp	2020-10-25 13:21:07.341964025 +0900
 +++ ../../git/progit2/progit2/book/preface_ben.asc	2020-06-28 16:44:50.961020654 +0900
 @@ -1,8 +1,12 @@
  [preface]
@@ -20295,14 +20271,14 @@ diff -au /tmp/book/preface_ben.asc.tmp ../../git/progit2/progit2/book/preface_be
 +I hope it helps you as much as it did me.
 Warning: file not found: ../../git/progit2/progit2-ja/book/preface_schacon.asc
 diff -au /tmp/book/toc.asc.tmp ../../git/progit2/progit2/book/toc.asc
---- /tmp/book/toc.asc.tmp	2020-10-25 11:05:02.601659530 +0900
+--- /tmp/book/toc.asc.tmp	2020-10-25 13:21:07.348964398 +0900
 +++ ../../git/progit2/progit2/book/toc.asc	2020-06-28 16:44:50.961020654 +0900
 @@ -0,0 +1 @@
 +{{ toc }}
 Warning: file not found: ../../git/progit2/progit2-ja/ch01-getting-started.asc
 Warning: file not found: ../../git/progit2/progit2-ja/ch02-git-basics-chapter.asc
 diff -au /tmp/ch03-git-branching.asc.tmp ../../git/progit2/progit2/ch03-git-branching.asc
---- /tmp/ch03-git-branching.asc.tmp	2020-10-25 11:05:02.606659812 +0900
+--- /tmp/ch03-git-branching.asc.tmp	2020-10-25 13:21:07.357964876 +0900
 +++ ../../git/progit2/progit2/ch03-git-branching.asc	2020-06-28 16:44:50.963020948 +0900
 @@ -1,7 +1,7 @@
 -[#ch03-git-branching]
@@ -20316,7 +20292,7 @@ diff -au /tmp/ch03-git-branching.asc.tmp ../../git/progit2/progit2/ch03-git-bran
  In many VCS tools, this is a somewhat expensive process, often requiring you to create a new copy of your source code directory, which can take a long time for large projects.
 Warning: file not found: ../../git/progit2/progit2-ja/ch04-git-on-the-server.asc
 diff -au /tmp/ch05-distributed-git.asc.tmp ../../git/progit2/progit2/ch05-distributed-git.asc
---- /tmp/ch05-distributed-git.asc.tmp	2020-10-25 11:05:02.610660037 +0900
+--- /tmp/ch05-distributed-git.asc.tmp	2020-10-25 13:21:07.364965249 +0900
 +++ ../../git/progit2/progit2/ch05-distributed-git.asc	2020-06-28 16:44:50.963020948 +0900
 @@ -1,8 +1,8 @@
 -[#ch05-distributed-git]
@@ -20331,7 +20307,7 @@ diff -au /tmp/ch05-distributed-git.asc.tmp ../../git/progit2/progit2/ch05-distri
  In this chapter, you'll see how to work with Git in a distributed environment as a contributor and an integrator.
  That is, you'll learn how to contribute code successfully to a project and make it as easy on you and the project maintainer as possible, and also how to maintain a project successfully with a number of developers contributing.
 diff -au /tmp/ch06-github.asc.tmp ../../git/progit2/progit2/ch06-github.asc
---- /tmp/ch06-github.asc.tmp	2020-10-25 11:05:02.615660318 +0900
+--- /tmp/ch06-github.asc.tmp	2020-10-25 13:21:07.374965781 +0900
 +++ ../../git/progit2/progit2/ch06-github.asc	2020-06-28 16:44:50.963020948 +0900
 @@ -1,5 +1,4 @@
 -[#ch06-github]
@@ -20340,7 +20316,7 @@ diff -au /tmp/ch06-github.asc.tmp ../../git/progit2/progit2/ch06-github.asc
  == GitHub
  
  (((GitHub)))
-@@ -12,6 +11,7 @@
+@@ -12,14 +11,13 @@
  
  If you are not interested in using GitHub to host your own projects or to collaborate with other projects that are hosted on GitHub, you can safely skip to <<ch07-git-tools#ch07-git-tools>>.
  
@@ -20348,8 +20324,16 @@ diff -au /tmp/ch06-github.asc.tmp ../../git/progit2/progit2/ch06-github.asc
  .Interfaces Change
  ====
  It's important to note that like many active websites, the UI elements in these screenshots are bound to change over time.
+ Hopefully the general idea of what we're trying to accomplish here will still be there, but if you want more up to date versions of these screens, the online versions of this book may have newer screenshots.
+ ====
+ 
+-====
+-====
+ include::book/06-github/sections/1-setting-up-account.asc[]
+ 
+ include::book/06-github/sections/2-contributing.asc[]
 diff -au /tmp/ch07-git-tools.asc.tmp ../../git/progit2/progit2/ch07-git-tools.asc
---- /tmp/ch07-git-tools.asc.tmp	2020-10-25 11:05:02.620660599 +0900
+--- /tmp/ch07-git-tools.asc.tmp	2020-10-25 13:21:07.380966100 +0900
 +++ ../../git/progit2/progit2/ch07-git-tools.asc	2020-06-28 16:44:50.963020948 +0900
 @@ -1,11 +1,10 @@
 -[#ch07-git-tools]
@@ -20379,7 +20363,7 @@ diff -au /tmp/ch07-git-tools.asc.tmp ../../git/progit2/progit2/ch07-git-tools.as
 +If you want to use subprojects in your project, you've learned how to accommodate those needs.
 +At this point, you should be able to do most of the things in Git that you'll need on the command line day to day and feel comfortable doing so.
 diff -au /tmp/ch08-customizing-git.asc.tmp ../../git/progit2/progit2/ch08-customizing-git.asc
---- /tmp/ch08-customizing-git.asc.tmp	2020-10-25 11:05:02.624660824 +0900
+--- /tmp/ch08-customizing-git.asc.tmp	2020-10-25 13:21:07.390966632 +0900
 +++ ../../git/progit2/progit2/ch08-customizing-git.asc	2020-06-28 16:44:50.964021095 +0900
 @@ -1,5 +1,4 @@
 -[#ch08-customizing-git]
@@ -20390,7 +20374,7 @@ diff -au /tmp/ch08-customizing-git.asc.tmp ../../git/progit2/progit2/ch08-custom
  So far, we've covered the basics of how Git works and how to use it, and we've introduced a number of tools that Git provides to help you use it easily and efficiently.
 Warning: file not found: ../../git/progit2/progit2-ja/ch09-git-and-other-systems.asc
 diff -au /tmp/ch10-git-internals.asc.tmp ../../git/progit2/progit2/ch10-git-internals.asc
---- /tmp/ch10-git-internals.asc.tmp	2020-10-25 11:05:02.628661049 +0900
+--- /tmp/ch10-git-internals.asc.tmp	2020-10-25 13:21:07.396966951 +0900
 +++ ../../git/progit2/progit2/ch10-git-internals.asc	2020-06-28 16:44:50.964021095 +0900
 @@ -1,9 +1,8 @@
 -[#ch10-git-internals]
@@ -20428,14 +20412,14 @@ diff -au /tmp/ch10-git-internals.asc.tmp ../../git/progit2/progit2/ch10-git-inte
  Git as a content-addressable filesystem is a very powerful tool that you can easily use as more than just a VCS.
  We hope you can use your newfound knowledge of Git internals to implement your own cool application of this technology and feel more comfortable using Git in more advanced ways.
 diff -au /tmp/index.asc.tmp ../../git/progit2/progit2/index.asc
---- /tmp/index.asc.tmp	2020-10-25 11:05:02.633661330 +0900
+--- /tmp/index.asc.tmp	2020-10-25 13:21:07.403967323 +0900
 +++ ../../git/progit2/progit2/index.asc	2020-06-28 16:44:51.438090759 +0900
 @@ -0,0 +1,3 @@
 +[#index]
 +[index]
 += Index
 diff -au /tmp/progit.asc.tmp ../../git/progit2/progit2/progit.asc
---- /tmp/progit.asc.tmp	2020-10-25 11:05:02.637661555 +0900
+--- /tmp/progit.asc.tmp	2020-10-25 13:21:07.411967749 +0900
 +++ ../../git/progit2/progit2/progit.asc	2020-06-28 16:44:51.438090759 +0900
 @@ -0,0 +1,52 @@
 +Pro Git

--- a/progit2ja_diff/progit2ja_diff.perl
+++ b/progit2ja_diff/progit2ja_diff.perl
@@ -40,6 +40,7 @@
 ###  Creative Commons Attribution-NonCommercial-ShareAlike 3.0 とします。
 
 use strict;
+use Encode qw/decode_utf8 encode_utf8/;
 use File::Basename;
 use File::Path;
 
@@ -109,6 +110,12 @@ sub output_ja_tempfile {
       if ($found_slashes_status == 2) {
         if ($line =~ /^include/) {
           $to_be_read = 1; $continue_flag = 1;
+        } elsif ($line =~ /^[=]+/) {
+          if (decode_utf8($line) =~ /[\p{Han}|\p{Hiragana}|\p{Katakana}]+/) {
+            $to_be_read = 0; $continue_flag = 0;
+          } else {
+            $to_be_read = 1; $continue_flag = 1;
+          }
         } elsif ($line =~ /^\n/) {
           if ($continue_flag == 0) {
             $to_be_read = 0; $continue_flag = 0;