提交: b787669a106a310a5b396d9344e165691ede1234 - mytools (git)

Commit MetaInfo

• 修訂: b787669a106a310a5b396d9344e165691ede1234 (tree)
• 時間: 2020-10-25 20:20:29
• 作者: matsuand <30614168+matsuand@user...>
• Commiter: matsuand

Log Message

コメントを含まない、コメントが完了していないなどの場合への対処。20201025結果修正。

Change Summary

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

差異

--- 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 13:21:06.560922481 +0900
+--- /tmp/A-git-in-other-environments.asc.tmp	2020-10-25 20:17:51.668319820 +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 13:21:06.574923226 +0900
+--- /tmp/C-git-commands.asc.tmp	2020-10-25 20:17:51.792321515 +0900
 +++ ../../git/progit2/progit2/C-git-commands.asc	2020-08-17 16:38:51.074694961 +0900
 @@ -1,4 +1,4 @@
 -[#C-git-commands]
@@ -684,13 +684,14 @@ 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 13:21:06.580923545 +0900
+--- /tmp/LICENSE.asc.tmp	2020-10-25 20:17:51.840322171 +0900
 +++ ../../git/progit2/progit2/LICENSE.asc	2020-06-28 16:44:50.900011670 +0900
-@@ -0,0 +1,2 @@
+@@ -1 +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 http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 +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 13:21:06.590924077 +0900
+--- /tmp/README.asc.tmp	2020-10-25 20:17:51.895322923 +0900
 +++ ../../git/progit2/progit2/README.asc	2020-09-07 09:33:11.246683703 +0900
 @@ -1,51 +1,22 @@
 -= Pro Git 第2版 日本語翻訳
@@ -776,22 +777,63 @@ 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 13:21:06.598924502 +0900
+--- /tmp/TRANSLATION_NOTES.asc.tmp	2020-10-25 20:17:51.950323675 +0900
 +++ ../../git/progit2/progit2/TRANSLATION_NOTES.asc	2020-06-28 16:44:50.919014468 +0900
-@@ -0,0 +1,11 @@
+@@ -1,44 +1,11 @@
+-== 翻訳作業メモ
 +== Translation Notes
-+
+ 
+-Pro Git第2版の翻訳作業はGitHubを使って管理していきます。2014/11時点の最優先事項は*「第2版で未訳出の章の翻訳」*です。手順と注意事項を順を追って説明します。
 +After forking this repository to translate the work, this file is where the notes for coordinating the translation work would go.
 +Things like standardizing on words and expressions so that the work is consistent or notes on how the contributing process is to be handled.
-+
+ 
+-なお、Pro Git第2版は全文がAsciiDocという記法で書かれています。記法に馴染みのないかたは、以下のガイド等に目を通してみてください。
 +As a translation maintainer, also feel free to modify or completely rewrite the README file to contain instructions specific to your translation.
-+
+ 
+-1. http://reddog.s35.xrea.com/wiki/AsciiDoc%E3%81%AE%E6%9B%B8%E3%81%8D%E6%96%B9.html[AsciiDocの書き方 - mynote]
+-1. http://asciidoctor.org/docs/asciidoc-writers-guide/[AsciiDoc Writer’s Guide]
+-1. http://www.methods.co.nz/asciidoc/[AsciiDoc User Manual]
 +=== Translation Status
-+
+ 
+-=== 作業の手順
+-
+-1. 作業着手の意思表示をする
+-  - 「作業はじめます」というissueをたてる
+-  - Work In Progressのプルリクエストを送る
+-1. 翻訳する
+-1. 作業進捗ファイルを更新する
+-1. 翻訳後の作業を行う
+-
+-各手順の詳細は以下の通りです。
+-
+-==== 作業着手の意思表示をする
+-
+-貴重な翻訳リソースが重複作業で無駄になってしまうことは絶対に避けたいので、以下のいずれかの方法で*作業着手の意思表示*をしてください。
+-
+-  - 「第◯章の作業はじめます」というissueをたてる
+-  - Work In ProgressのPull Requestを送る
+-
+-https://github.com/progit/progit2-ja/releases[Releases] に掲載されているのは*翻訳済みの章*、 https://github.com/progit/progit2-ja/labels/wip[wipタグがついているissue] は*現在翻訳中の章*です。確認して、作業が重複することのないようにしてください。
+-
+-==== 翻訳する
+-
+-最大のルールは*「既訳を尊重する」*ことです。第2版の多くは第1版から変更されていませんので、まずは「差分を確認しつつ、可能な限り既訳をコピペ」でお願いします。用語についても、既訳を再優先してください。
+-
+-既訳は https://github.com/progit/progit/tree/master/ja[第1版のGitHubリポジトリ] で確認・入手できます。
+-
+-もう1点お願いしたいのが、*「原文の訳文への埋め込み」*です。原文は今後も頻繁に更新されていきますので、埋め込まれた原文を進捗管理に使います。 https://github.com/progit/progit2-ja/tree/master/book/01-introduction[第1章の訳文] を参考に、翻訳に使用した原文を訳文にも埋め込んでください。
+-
+-==== 翻訳後の作業
+-
+-以下の作業を行ってください。
+-
+-1. `status.json`の更新（コンテンツ自動生成時に使用されます）
+-1. 作業完了の意思表示（該当のissueやPull Requestにコメントする）
+\ ファイル末尾に改行がありません
 +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 13:21:06.605924875 +0900
+--- /tmp/book/01-introduction/sections/about-version-control.asc.tmp	2020-10-25 20:17:52.065325257 +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
@@ -870,7 +912,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 13:21:06.612925247 +0900
+--- /tmp/book/01-introduction/sections/command-line.asc.tmp	2020-10-25 20:17:52.117325976 +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
@@ -889,7 +931,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 13:21:06.619925619 +0900
+--- /tmp/book/01-introduction/sections/first-time-setup.asc.tmp	2020-10-25 20:17:52.137326253 +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]]
@@ -1048,7 +1090,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 13:21:06.625925939 +0900
+--- /tmp/book/01-introduction/sections/help.asc.tmp	2020-10-25 20:17:52.180326847 +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]]
@@ -1104,7 +1146,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 13:21:06.632926311 +0900
+--- /tmp/book/01-introduction/sections/history.asc.tmp	2020-10-25 20:17:52.341329074 +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)
@@ -1113,7 +1155,7 @@ 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 13:21:06.638926630 +0900
+--- /tmp/book/01-introduction/sections/installing.asc.tmp	2020-10-25 20:17:52.437330401 +0900
 +++ ../../git/progit2/progit2/book/01-introduction/sections/installing.asc	2020-07-04 16:36:46.718685392 +0900
 @@ -4,72 +4,144 @@
  Even if it's already installed, it's probably a good idea to update to the latest version.
@@ -1288,7 +1330,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 13:21:06.645927003 +0900
+--- /tmp/book/02-git-basics/sections/aliases.asc.tmp	2020-10-25 20:17:52.647333305 +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]]
@@ -1365,7 +1407,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 13:21:06.652927375 +0900
+--- /tmp/book/02-git-basics/sections/getting-a-repository.asc.tmp	2020-10-25 20:17:52.682333789 +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]]
@@ -1472,7 +1514,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 13:21:06.661927854 +0900
+--- /tmp/book/02-git-basics/sections/recording-changes.asc.tmp	2020-10-25 20:17:52.715334245 +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
@@ -2137,7 +2179,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 13:21:06.672928439 +0900
+--- /tmp/book/02-git-basics/sections/remotes.asc.tmp	2020-10-25 20:17:52.757334826 +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]]
@@ -2398,7 +2440,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 13:21:06.680928864 +0900
+--- /tmp/book/02-git-basics/sections/tagging.asc.tmp	2020-10-25 20:17:52.820335697 +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]]
@@ -2719,7 +2761,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 13:21:06.690929396 +0900
+--- /tmp/book/02-git-basics/sections/undoing.asc.tmp	2020-10-25 20:17:52.876336472 +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]]
@@ -2972,7 +3014,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 13:21:06.699929875 +0900
+--- /tmp/book/02-git-basics/sections/viewing-history.asc.tmp	2020-10-25 20:17:52.922337108 +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]]
@@ -3322,7 +3364,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 13:21:06.707930301 +0900
+--- /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp	2020-10-25 20:17:53.010338324 +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.
@@ -3675,7 +3717,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 13:21:06.716930779 +0900
+--- /tmp/book/03-git-branching/sections/branch-management.asc.tmp	2020-10-25 20:17:53.065339085 +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]]
@@ -3823,7 +3865,7 @@ 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 13:21:06.725931258 +0900
+--- /tmp/book/03-git-branching/sections/nutshell.asc.tmp	2020-10-25 20:17:53.114339763 +0900
 +++ ../../git/progit2/progit2/book/03-git-branching/sections/nutshell.asc	2020-09-26 08:56:07.950296410 +0900
 @@ -1,100 +1,150 @@
 -[[r_git_branches_overview]]
@@ -4063,7 +4105,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 13:21:06.735931790 +0900
+--- /tmp/book/03-git-branching/sections/rebasing.asc.tmp	2020-10-25 20:17:53.161340412 +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]]
@@ -4325,7 +4367,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 13:21:06.744932269 +0900
+--- /tmp/book/03-git-branching/sections/remote-branches.asc.tmp	2020-10-25 20:17:53.227341325 +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]]
@@ -4604,7 +4646,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 13:21:06.753932747 +0900
+--- /tmp/book/03-git-branching/sections/workflows.asc.tmp	2020-10-25 20:17:53.264341837 +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
@@ -4680,7 +4722,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 13:21:06.760933120 +0900
+--- /tmp/book/04-git-server/sections/generating-ssh-key.asc.tmp	2020-10-25 20:17:53.332342777 +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]]
@@ -4746,7 +4788,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 13:21:06.770933652 +0900
+--- /tmp/book/04-git-server/sections/git-daemon.asc.tmp	2020-10-25 20:17:53.383343482 +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
@@ -4829,7 +4871,7 @@ 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 13:21:06.778934077 +0900
+--- /tmp/book/04-git-server/sections/git-on-a-server.asc.tmp	2020-10-25 20:17:53.433344174 +0900
 +++ ../../git/progit2/progit2/book/04-git-server/sections/git-on-a-server.asc	2020-07-04 16:36:46.723685453 +0900
 @@ -1,45 +1,74 @@
 -[[r_git_on_the_server]]
@@ -4957,7 +4999,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 13:21:06.787934556 +0900
+--- /tmp/book/04-git-server/sections/gitlab.asc.tmp	2020-10-25 20:17:53.512345266 +0900
 +++ ../../git/progit2/progit2/book/04-git-server/sections/gitlab.asc	2020-09-07 09:33:11.247683703 +0900
 @@ -2,60 +2,63 @@
  
@@ -5135,7 +5177,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 13:21:06.793934875 +0900
+--- /tmp/book/04-git-server/sections/gitweb.asc.tmp	2020-10-25 20:17:53.530345515 +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.
@@ -5210,7 +5252,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 13:21:06.800935248 +0900
+--- /tmp/book/04-git-server/sections/hosted.asc.tmp	2020-10-25 20:17:53.539345639 +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.
@@ -5221,7 +5263,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 13:21:06.808935673 +0900
+--- /tmp/book/04-git-server/sections/protocols.asc.tmp	2020-10-25 20:17:53.552345819 +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
@@ -5461,7 +5503,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 13:21:06.817936152 +0900
+--- /tmp/book/04-git-server/sections/setting-up-server.asc.tmp	2020-10-25 20:17:53.564345985 +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]]
@@ -5623,7 +5665,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 13:21:06.825936578 +0900
+--- /tmp/book/04-git-server/sections/smart-http.asc.tmp	2020-10-25 20:17:53.593346386 +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
@@ -5693,17 +5735,20 @@ diff -au /tmp/book/04-git-server/sections/smart-http.asc.tmp ../../git/progit2/p
  There are tons of ways to have Apache authenticate users, you'll have to choose and implement one of them.
  This is just the simplest example we could come up with.
  You'll also almost certainly want to set this up over SSL so all this data is encrypted.
-@@ -32,6 +66,7 @@
+@@ -32,9 +66,7 @@
  It does not implement any authentication itself, but that can easily be controlled at the layer of the web server that invokes it.
  You can do this with nearly any CGI-capable web server, so go with the one that you know best.
  
 +[NOTE]
  ====
 -For more information on configuring authentication in Apache, check out the Apache docs here: http://httpd.apache.org/docs/current/howto/auth.html[]
+-====
+-
+-====
 +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 13:21:06.837937216 +0900
+--- /tmp/book/05-distributed-git/sections/contributing.asc.tmp	2020-10-25 20:17:53.643347077 +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]]
@@ -6641,7 +6686,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 13:21:06.846937695 +0900
+--- /tmp/book/05-distributed-git/sections/distributed-workflows.asc.tmp	2020-10-25 20:17:53.702347893 +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
@@ -6764,7 +6809,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 13:21:06.856938227 +0900
+--- /tmp/book/05-distributed-git/sections/maintaining.asc.tmp	2020-10-25 20:17:53.768348806 +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
@@ -7399,7 +7444,7 @@ 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 13:21:06.863938599 +0900
+--- /tmp/book/06-github/sections/1-setting-up-account.asc.tmp	2020-10-25 20:17:53.882350382 +0900
 +++ ../../git/progit2/progit2/book/06-github/sections/1-setting-up-account.asc	2020-07-04 16:36:46.730685537 +0900
 @@ -1,21 +1,22 @@
  === Account Setup and Configuration
@@ -7501,7 +7546,7 @@ 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 13:21:06.875939238 +0900
+--- /tmp/book/06-github/sections/2-contributing.asc.tmp	2020-10-25 20:17:53.910350769 +0900
 +++ ../../git/progit2/progit2/book/06-github/sections/2-contributing.asc	2020-09-30 09:43:39.046514305 +0900
 @@ -4,77 +4,131 @@
  
@@ -8158,7 +8203,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 13:21:06.885939770 +0900
+--- /tmp/book/06-github/sections/3-maintaining.asc.tmp	2020-10-25 20:17:53.958351433 +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]]
@@ -8512,7 +8557,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 13:21:06.893940195 +0900
+--- /tmp/book/06-github/sections/4-managing-organization.asc.tmp	2020-10-25 20:17:54.026352373 +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]]
@@ -8580,7 +8625,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 13:21:06.902940674 +0900
+--- /tmp/book/06-github/sections/5-scripting.asc.tmp	2020-10-25 20:17:54.050352705 +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.
@@ -8787,7 +8832,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 13:21:06.914941312 +0900
+--- /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp	2020-10-25 20:17:54.146354033 +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]]
@@ -9410,7 +9455,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.
  
-@@ -271,9 +664,19 @@
+@@ -271,6 +664,14 @@
  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.
  
@@ -9425,13 +9470,8 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
  You can see that there is no difference between the branch we were on and the result of the merge.
  
  This can often be useful to basically trick Git into thinking that a branch is already merged when doing a merge later on.
- For example, say you branched off a `release` branch and have done some work on it that you will want to merge back into your `master` branch at some point.
- In the meantime some bugfix on `master` needs to be backported into your `release` branch.
- You can merge the bugfix branch into the `release` branch and also `merge -s ours` the same branch into your `master` branch (even though the fix is already there) so when you later merge the `release` branch again, there are no conflicts from the bugfix.
-+
-+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 13:21:06.922941738 +0900
+--- /tmp/book/07-git-tools/sections/bundling.asc.tmp	2020-10-25 20:17:54.194354697 +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]]
@@ -9600,7 +9640,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 13:21:06.928942057 +0900
+--- /tmp/book/07-git-tools/sections/credentials.asc.tmp	2020-10-25 20:17:54.243355374 +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]]
@@ -9756,7 +9796,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 13:21:06.934942377 +0900
+--- /tmp/book/07-git-tools/sections/debugging.asc.tmp	2020-10-25 20:17:54.295356093 +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
@@ -9928,7 +9968,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 13:21:06.946943015 +0900
+--- /tmp/book/07-git-tools/sections/interactive-staging.asc.tmp	2020-10-25 20:17:54.339356702 +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]]
@@ -10161,7 +10201,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 13:21:06.954943440 +0900
+--- /tmp/book/07-git-tools/sections/replace.asc.tmp	2020-10-25 20:17:54.352356881 +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]]
@@ -10381,7 +10421,7 @@ 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 13:21:06.960943760 +0900
+--- /tmp/book/07-git-tools/sections/rerere.asc.tmp	2020-10-25 20:17:54.364357047 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/rerere.asc	2020-06-28 16:44:50.940017561 +0900
 @@ -1,68 +1,252 @@
 -[[r_rerere]]
@@ -10657,7 +10697,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 13:21:06.969944238 +0900
+--- /tmp/book/07-git-tools/sections/reset.asc.tmp	2020-10-25 20:17:54.391357421 +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]]
@@ -11006,7 +11046,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 13:21:06.977944664 +0900
+--- /tmp/book/07-git-tools/sections/revision-selection.asc.tmp	2020-10-25 20:17:54.439358084 +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]]
@@ -11479,7 +11519,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 13:21:06.989945302 +0900
+--- /tmp/book/07-git-tools/sections/rewriting-history.asc.tmp	2020-10-25 20:17:54.487358748 +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]]
@@ -11918,7 +11958,7 @@ 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 13:21:06.994945568 +0900
+--- /tmp/book/07-git-tools/sections/searching.asc.tmp	2020-10-25 20:17:54.529359329 +0900
 +++ ../../git/progit2/progit2/book/07-git-tools/sections/searching.asc	2020-06-28 16:44:50.941017708 +0900
 @@ -1,30 +1,91 @@
 -[[r_searching]]
@@ -12107,7 +12147,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 13:21:07.002945994 +0900
+--- /tmp/book/07-git-tools/sections/signing.asc.tmp	2020-10-25 20:17:54.576359979 +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]]
@@ -12316,7 +12356,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 13:21:07.011946473 +0900
+--- /tmp/book/07-git-tools/sections/stashing-cleaning.asc.tmp	2020-10-25 20:17:54.601360324 +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]]
@@ -12645,7 +12685,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 13:21:07.024947164 +0900
+--- /tmp/book/07-git-tools/sections/submodules.asc.tmp	2020-10-25 20:17:54.637360822 +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]]
@@ -13695,7 +13735,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 13:21:07.032947590 +0900
+--- /tmp/book/07-git-tools/sections/subtree-merges.asc.tmp	2020-10-25 20:17:54.706361776 +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]]
@@ -13806,7 +13846,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 13:21:07.043948175 +0900
+--- /tmp/book/08-customizing-git/sections/attributes.asc.tmp	2020-10-25 20:17:54.787362897 +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
@@ -14186,7 +14226,7 @@ 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 13:21:07.057948919 +0900
+--- /tmp/book/08-customizing-git/sections/config.asc.tmp	2020-10-25 20:17:54.848363750 +0900
 +++ ../../git/progit2/progit2/book/08-customizing-git/sections/config.asc	2020-08-10 10:02:15.170231399 +0900
 @@ -1,97 +1,202 @@
 -[[r_git_config]]
@@ -14720,7 +14760,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 13:21:07.066949398 +0900
+--- /tmp/book/08-customizing-git/sections/hooks.asc.tmp	2020-10-25 20:17:54.915364687 +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]]
@@ -14786,7 +14826,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 13:21:07.075949877 +0900
+--- /tmp/book/08-customizing-git/sections/policy.asc.tmp	2020-10-25 20:17:54.984365650 +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]]
@@ -15197,7 +15237,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 13:21:07.085950409 +0900
+--- /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp	2020-10-25 20:17:55.062366743 +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
@@ -15583,7 +15623,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 13:21:07.096950994 +0900
+--- /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp	2020-10-25 20:17:55.124367614 +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
@@ -16216,7 +16256,7 @@ 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 13:21:07.104951419 +0900
+--- /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp	2020-10-25 20:17:55.181368414 +0900
 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/client-svn.asc	2020-07-04 16:36:46.740685658 +0900
 @@ -1,10 +1,12 @@
 -[[r_git_svn]]
@@ -16669,7 +16709,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 13:21:07.115952004 +0900
+--- /tmp/book/09-git-and-other-scms/sections/import-custom.asc.tmp	2020-10-25 20:17:55.227369059 +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]]
@@ -17042,7 +17082,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 13:21:07.124952483 +0900
+--- /tmp/book/09-git-and-other-scms/sections/import-hg.asc.tmp	2020-10-25 20:17:55.270369662 +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)))
@@ -17170,7 +17210,7 @@ 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 13:21:07.136953121 +0900
+--- /tmp/book/09-git-and-other-scms/sections/import-p4.asc.tmp	2020-10-25 20:17:55.316370306 +0900
 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-p4.asc	2020-06-28 16:44:50.947018592 +0900
 @@ -1,4 +1,4 @@
 -[[r_perforce_import]]
@@ -17280,7 +17320,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 13:21:07.146953653 +0900
+--- /tmp/book/09-git-and-other-scms/sections/import-svn.asc.tmp	2020-10-25 20:17:55.361370939 +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.
@@ -17421,7 +17461,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 13:21:07.155954132 +0900
+--- /tmp/book/10-git-internals/sections/environment.asc.tmp	2020-10-25 20:17:55.448372159 +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.
@@ -17605,7 +17645,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 13:21:07.164954610 +0900
+--- /tmp/book/10-git-internals/sections/maintenance.asc.tmp	2020-10-25 20:17:55.498372861 +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.
@@ -17944,7 +17984,7 @@ 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 13:21:07.175955196 +0900
+--- /tmp/book/10-git-internals/sections/objects.asc.tmp	2020-10-25 20:17:55.549373576 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/objects.asc	2020-07-04 16:36:46.743685694 +0900
 @@ -1,159 +1,438 @@
 -[[r_objects]]
@@ -18431,7 +18471,7 @@ 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 13:21:07.184955674 +0900
+--- /tmp/book/10-git-internals/sections/packfiles.asc.tmp	2020-10-25 20:17:55.609374419 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/packfiles.asc	2020-06-28 16:44:50.948018739 +0900
 @@ -1,25 +1,87 @@
  === Packfiles
@@ -18616,7 +18656,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 13:21:07.193956153 +0900
+--- /tmp/book/10-git-internals/sections/plumbing-porcelain.asc.tmp	2020-10-25 20:17:55.673375319 +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]]
@@ -18669,7 +18709,7 @@ 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 13:21:07.201956579 +0900
+--- /tmp/book/10-git-internals/sections/refs.asc.tmp	2020-10-25 20:17:55.721375990 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/refs.asc	2020-07-04 16:36:46.743685694 +0900
 @@ -1,78 +1,182 @@
 -[[r_git_refs]]
@@ -18906,7 +18946,7 @@ 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 13:21:07.208956951 +0900
+--- /tmp/book/10-git-internals/sections/refspec.asc.tmp	2020-10-25 20:17:55.762376565 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/refspec.asc	2020-07-04 16:36:46.743685694 +0900
 @@ -1,56 +1,145 @@
 -[[r_refspec]]
@@ -19071,7 +19111,7 @@ 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 13:21:07.217957430 +0900
+--- /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp	2020-10-25 20:17:55.813377280 +0900
 +++ ../../git/progit2/progit2/book/10-git-internals/sections/transfer-protocols.asc	2020-06-28 16:44:50.950019034 +0900
 @@ -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.
@@ -19353,7 +19393,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 13:21:07.228958015 +0900
+--- /tmp/book/A-git-in-other-environments/sections/bash.asc.tmp	2020-10-25 20:17:55.891378377 +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
@@ -19401,7 +19441,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 13:21:07.236958440 +0900
+--- /tmp/book/A-git-in-other-environments/sections/guis.asc.tmp	2020-10-25 20:17:55.939379048 +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
@@ -19546,7 +19586,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 13:21:07.246958972 +0900
+--- /tmp/book/A-git-in-other-environments/sections/powershell.asc.tmp	2020-10-25 20:17:55.990379766 +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]]
@@ -19647,7 +19687,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 13:21:07.254959398 +0900
+--- /tmp/book/A-git-in-other-environments/sections/visualstudio.asc.tmp	2020-10-25 20:17:56.018380158 +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
@@ -19684,7 +19724,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 13:21:07.263959876 +0900
+--- /tmp/book/A-git-in-other-environments/sections/zsh.asc.tmp	2020-10-25 20:17:56.061380765 +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
@@ -19757,7 +19797,7 @@ 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 13:21:07.280960781 +0900
+--- /tmp/book/B-embedding-git/sections/jgit.asc.tmp	2020-10-25 20:17:56.213382906 +0900
 +++ ../../git/progit2/progit2/book/B-embedding-git/sections/jgit.asc	2020-06-28 16:44:50.955019770 +0900
 @@ -1,21 +1,36 @@
  === JGit
@@ -19873,7 +19913,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 13:21:07.291961366 +0900
+--- /tmp/book/B-embedding-git/sections/libgit2.asc.tmp	2020-10-25 20:17:56.269383696 +0900
 +++ ../../git/progit2/progit2/book/B-embedding-git/sections/libgit2.asc	2020-07-01 10:48:37.625009675 +0900
 @@ -1,13 +1,15 @@
  === Libgit2
@@ -20081,7 +20121,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 13:21:07.299961791 +0900
+--- /tmp/book/contributors.asc.tmp	2020-10-25 20:17:56.322384440 +0900
 +++ ../../git/progit2/progit2/book/contributors.asc	2020-06-28 16:44:50.955019770 +0900
 @@ -1,4 +1,12 @@
  [preface]
@@ -20098,7 +20138,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 13:21:07.307962217 +0900
+--- /tmp/book/dedication.asc.tmp	2020-10-25 20:17:56.345384765 +0900
 +++ ../../git/progit2/progit2/book/dedication.asc	2020-06-28 16:44:50.960020506 +0900
 @@ -1,8 +1,8 @@
 -[preface]
@@ -20113,12 +20153,8 @@ 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 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 13:21:07.326963228 +0900
+--- /tmp/book/introduction.asc.tmp	2020-10-25 20:17:56.420385824 +0900
 +++ ../../git/progit2/progit2/book/introduction.asc	2020-06-28 16:44:50.960020506 +0900
 @@ -1,69 +1,58 @@
  [preface]
@@ -20243,15 +20279,16 @@ 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 13:21:07.334963653 +0900
+--- /tmp/book/license.asc.tmp	2020-10-25 20:17:56.444386161 +0900
 +++ ../../git/progit2/progit2/book/license.asc	2020-06-28 16:44:50.961020654 +0900
-@@ -0,0 +1,4 @@
-+[preface]
+@@ -1,4 +1,4 @@
+ [preface]
+-== ライセンス
 +== Licence
-+
-+include::../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 13:21:07.341964025 +0900
+--- /tmp/book/preface_ben.asc.tmp	2020-10-25 20:17:56.461386401 +0900
 +++ ../../git/progit2/progit2/book/preface_ben.asc	2020-06-28 16:44:50.961020654 +0900
 @@ -1,8 +1,12 @@
  [preface]
@@ -20271,14 +20308,10 @@ 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 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 13:21:07.357964876 +0900
+--- /tmp/ch03-git-branching.asc.tmp	2020-10-25 20:17:56.482386697 +0900
 +++ ../../git/progit2/progit2/ch03-git-branching.asc	2020-06-28 16:44:50.963020948 +0900
 @@ -1,7 +1,7 @@
 -[#ch03-git-branching]
@@ -20292,7 +20325,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 13:21:07.364965249 +0900
+--- /tmp/ch05-distributed-git.asc.tmp	2020-10-25 20:17:56.497386909 +0900
 +++ ../../git/progit2/progit2/ch05-distributed-git.asc	2020-06-28 16:44:50.963020948 +0900
 @@ -1,8 +1,8 @@
 -[#ch05-distributed-git]
@@ -20307,7 +20340,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 13:21:07.374965781 +0900
+--- /tmp/ch06-github.asc.tmp	2020-10-25 20:17:56.513387134 +0900
 +++ ../../git/progit2/progit2/ch06-github.asc	2020-06-28 16:44:50.963020948 +0900
 @@ -1,5 +1,4 @@
 -[#ch06-github]
@@ -20333,7 +20366,7 @@ diff -au /tmp/ch06-github.asc.tmp ../../git/progit2/progit2/ch06-github.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 13:21:07.380966100 +0900
+--- /tmp/ch07-git-tools.asc.tmp	2020-10-25 20:17:56.526387317 +0900
 +++ ../../git/progit2/progit2/ch07-git-tools.asc	2020-06-28 16:44:50.963020948 +0900
 @@ -1,11 +1,10 @@
 -[#ch07-git-tools]
@@ -20363,7 +20396,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 13:21:07.390966632 +0900
+--- /tmp/ch08-customizing-git.asc.tmp	2020-10-25 20:17:56.537387472 +0900
 +++ ../../git/progit2/progit2/ch08-customizing-git.asc	2020-06-28 16:44:50.964021095 +0900
 @@ -1,5 +1,4 @@
 -[#ch08-customizing-git]
@@ -20374,7 +20407,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 13:21:07.396966951 +0900
+--- /tmp/ch10-git-internals.asc.tmp	2020-10-25 20:17:56.545387585 +0900
 +++ ../../git/progit2/progit2/ch10-git-internals.asc	2020-06-28 16:44:50.964021095 +0900
 @@ -1,9 +1,8 @@
 -[#ch10-git-internals]
@@ -20412,65 +20445,64 @@ 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 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 13:21:07.411967749 +0900
+--- /tmp/progit.asc.tmp	2020-10-25 20:17:56.639388909 +0900
 +++ ../../git/progit2/progit2/progit.asc	2020-06-28 16:44:51.438090759 +0900
-@@ -0,0 +1,52 @@
-+Pro Git
-+=======
+@@ -1,34 +1,35 @@
+ Pro Git
+ =======
 +Scott Chacon; Ben Straub
-+:doctype: book
-+:docinfo:
-+:toc:
-+:toclevels: 2
-+:pagenums:
-+:front-cover-image: image:book/cover.png[width=1050,height=1600]
+ :doctype: book
+ :docinfo:
+ :toc:
+ :toclevels: 2
+ :pagenums:
+ :front-cover-image: image:book/cover.png[width=1050,height=1600]
+-:toc-title: 目次
 +:icons: font
-+
-+ifdef::ebook-format[:leveloffset: -1]
-+
-+include::book/license.asc[]
-+
+ 
+ ifdef::ebook-format[:leveloffset: -1]
+ 
+ include::book/license.asc[]
+ 
+-include::book/preface_scott.asc[]
 +include::book/preface_schacon.asc[]
-+
-+include::book/preface_ben.asc[]
-+
-+include::book/dedication.asc[]
-+
+ 
+ include::book/preface_ben.asc[]
+ 
+ include::book/dedication.asc[]
+ 
+-//include::book/contributors.asc[]
 +include::book/contributors.asc[]
-+
-+include::book/introduction.asc[]
-+
+ 
+ include::book/introduction.asc[]
+ 
+-include::ch01-introduction.asc[]
 +include::ch01-getting-started.asc[]
-+
+ 
+-include::ch02-git-basics.asc[]
 +include::ch02-git-basics-chapter.asc[]
-+
-+include::ch03-git-branching.asc[]
-+
+ 
+ include::ch03-git-branching.asc[]
+ 
+-include::ch04-git-server.asc[]
 +include::ch04-git-on-the-server.asc[]
-+
-+include::ch05-distributed-git.asc[]
-+
-+include::ch06-github.asc[]
-+
-+include::ch07-git-tools.asc[]
-+
-+include::ch08-customizing-git.asc[]
-+
+ 
+ include::ch05-distributed-git.asc[]
+ 
+@@ -38,13 +39,13 @@
+ 
+ include::ch08-customizing-git.asc[]
+ 
+-include::ch09-git-and-other-scms.asc[]
 +include::ch09-git-and-other-systems.asc[]
-+
-+include::ch10-git-internals.asc[]
-+
-+include::A-git-in-other-environments.asc[]
-+
+ 
+ include::ch10-git-internals.asc[]
+ 
+ include::A-git-in-other-environments.asc[]
+ 
+-include::B-embedding-git.asc[]
 +include::B-embedding-git-in-your-applications.asc[]
-+
-+include::C-git-commands.asc[]
-+
-+ifndef::ebook-format[include::index.asc[]]
+ 
+ include::C-git-commands.asc[]
+ 

--- a/progit2ja_diff/progit2ja_diff.perl
+++ b/progit2ja_diff/progit2ja_diff.perl
@@ -5,13 +5,13 @@
 ###  利用方法
 ###    ./progit2ja_diff.perl <origdir> <jadir> [<target>]
 ###
-###      <origdir>: progit2 オリジナルのソーストップディレクトリ名
-###      <jadir>:   progit/progit2-ja のソーストップディレクトリ名
+###      <origdir>: progit2 オリジナルのソーストップディレクトリパス
+###      <jadir>:   progit/progit2-ja のソーストップディレクトリパス
 ###      <target>:  (任意)処理対象とするascファイルのベース名。
 ###                 この指定がない場合は全ファイルを対象とする。
 ###
 ###  progit/progit2-ja のソース内にコメントとして示された原文部分を
-###  progit オリジナル全ソースと比較して、diff を取り標準出力します。
+###  progit オリジナルソースと比較して diff を取り、標準出力します。
 ###
 ###  処理方法はざっと以下です。<origdir> 配下の *.asc ファイルを順に
 ###  処理します。そのベース名に応じた <jadir> 配下の *.asc ファイル
@@ -128,6 +128,9 @@ sub output_ja_tempfile {
         $lines = $lines . $line;
       }
     }
+    if ($lines ne "") {
+      &output_tempfile;
+    }
     close($fh_jasrc);
     close($fh_tempfile);
   }