From 18 Jan, 2021 0:00 UTC: All services will be temporary unavailable for maintenance
  • R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscaphegui翻訳comegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

Commit MetaInfo

Revisionb787669a106a310a5b396d9344e165691ede1234 (tree)
Time2020-10-25 20:20:29
Authormatsuand <30614168+matsuand@user...>
Commitermatsuand

Log Message

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

Change Summary

Incremental Difference

--- a/progit2ja_diff/20201025.result.txt
+++ b/progit2ja_diff/20201025.result.txt
@@ -1,5 +1,5 @@
11 diff -au /tmp/A-git-in-other-environments.asc.tmp ../../git/progit2/progit2/A-git-in-other-environments.asc
2---- /tmp/A-git-in-other-environments.asc.tmp 2020-10-25 13:21:06.560922481 +0900
2+--- /tmp/A-git-in-other-environments.asc.tmp 2020-10-25 20:17:51.668319820 +0900
33 +++ ../../git/progit2/progit2/A-git-in-other-environments.asc 2020-08-29 09:58:24.046195489 +0900
44 @@ -1,4 +1,4 @@
55 -[#A-git-in-other-environments]
@@ -22,7 +22,7 @@ diff -au /tmp/A-git-in-other-environments.asc.tmp ../../git/progit2/progit2/A-gi
2222
2323 Warning: file not found: ../../git/progit2/progit2-ja/B-embedding-git-in-your-applications.asc
2424 diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.asc
25---- /tmp/C-git-commands.asc.tmp 2020-10-25 13:21:06.574923226 +0900
25+--- /tmp/C-git-commands.asc.tmp 2020-10-25 20:17:51.792321515 +0900
2626 +++ ../../git/progit2/progit2/C-git-commands.asc 2020-08-17 16:38:51.074694961 +0900
2727 @@ -1,4 +1,4 @@
2828 -[#C-git-commands]
@@ -684,13 +684,14 @@ diff -au /tmp/C-git-commands.asc.tmp ../../git/progit2/progit2/C-git-commands.as
684684 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.
685685 We tried to avoid use of them throughout most of the rest of the book.
686686 diff -au /tmp/LICENSE.asc.tmp ../../git/progit2/progit2/LICENSE.asc
687---- /tmp/LICENSE.asc.tmp 2020-10-25 13:21:06.580923545 +0900
687+--- /tmp/LICENSE.asc.tmp 2020-10-25 20:17:51.840322171 +0900
688688 +++ ../../git/progit2/progit2/LICENSE.asc 2020-06-28 16:44:50.900011670 +0900
689-@@ -0,0 +1,2 @@
689+@@ -1 +1,2 @@
690+-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.
690691 +This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
691692 +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.
692693 diff -au /tmp/README.asc.tmp ../../git/progit2/progit2/README.asc
693---- /tmp/README.asc.tmp 2020-10-25 13:21:06.590924077 +0900
694+--- /tmp/README.asc.tmp 2020-10-25 20:17:51.895322923 +0900
694695 +++ ../../git/progit2/progit2/README.asc 2020-09-07 09:33:11.246683703 +0900
695696 @@ -1,51 +1,22 @@
696697 -= Pro Git 第2版 日本語翻訳
@@ -776,22 +777,63 @@ diff -au /tmp/README.asc.tmp ../../git/progit2/progit2/README.asc
776777 -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].
777778 +If you'd like to help out by making a change, take a look at the link:CONTRIBUTING.md[contributor's guide].
778779 diff -au /tmp/TRANSLATION_NOTES.asc.tmp ../../git/progit2/progit2/TRANSLATION_NOTES.asc
779---- /tmp/TRANSLATION_NOTES.asc.tmp 2020-10-25 13:21:06.598924502 +0900
780+--- /tmp/TRANSLATION_NOTES.asc.tmp 2020-10-25 20:17:51.950323675 +0900
780781 +++ ../../git/progit2/progit2/TRANSLATION_NOTES.asc 2020-06-28 16:44:50.919014468 +0900
781-@@ -0,0 +1,11 @@
782+@@ -1,44 +1,11 @@
783+-== 翻訳作業メモ
782784 +== Translation Notes
783-+
785+
786+-Pro Git第2版の翻訳作業はGitHubを使って管理していきます。2014/11時点の最優先事項は*「第2版で未訳出の章の翻訳」*です。手順と注意事項を順を追って説明します。
784787 +After forking this repository to translate the work, this file is where the notes for coordinating the translation work would go.
785788 +Things like standardizing on words and expressions so that the work is consistent or notes on how the contributing process is to be handled.
786-+
789+
790+-なお、Pro Git第2版は全文がAsciiDocという記法で書かれています。記法に馴染みのないかたは、以下のガイド等に目を通してみてください。
787791 +As a translation maintainer, also feel free to modify or completely rewrite the README file to contain instructions specific to your translation.
788-+
792+
793+-1. http://reddog.s35.xrea.com/wiki/AsciiDoc%E3%81%AE%E6%9B%B8%E3%81%8D%E6%96%B9.html[AsciiDocの書き方 - mynote]
794+-1. http://asciidoctor.org/docs/asciidoc-writers-guide/[AsciiDoc Writer’s Guide]
795+-1. http://www.methods.co.nz/asciidoc/[AsciiDoc User Manual]
789796 +=== Translation Status
790-+
797+
798+-=== 作業の手順
799+-
800+-1. 作業着手の意思表示をする
801+- - 「作業はじめます」というissueをたてる
802+- - Work In Progressのプルリクエストを送る
803+-1. 翻訳する
804+-1. 作業進捗ファイルを更新する
805+-1. 翻訳後の作業を行う
806+-
807+-各手順の詳細は以下の通りです。
808+-
809+-==== 作業着手の意思表示をする
810+-
811+-貴重な翻訳リソースが重複作業で無駄になってしまうことは絶対に避けたいので、以下のいずれかの方法で*作業着手の意思表示*をしてください。
812+-
813+- - 「第◯章の作業はじめます」というissueをたてる
814+- - Work In ProgressのPull Requestを送る
815+-
816+-https://github.com/progit/progit2-ja/releases[Releases] に掲載されているのは*翻訳済みの章*、 https://github.com/progit/progit2-ja/labels/wip[wipタグがついているissue] は*現在翻訳中の章*です。確認して、作業が重複することのないようにしてください。
817+-
818+-==== 翻訳する
819+-
820+-最大のルールは*「既訳を尊重する」*ことです。第2版の多くは第1版から変更されていませんので、まずは「差分を確認しつつ、可能な限り既訳をコピペ」でお願いします。用語についても、既訳を再優先してください。
821+-
822+-既訳は https://github.com/progit/progit/tree/master/ja[第1版のGitHubリポジトリ] で確認・入手できます。
823+-
824+-もう1点お願いしたいのが、*「原文の訳文への埋め込み」*です。原文は今後も頻繁に更新されていきますので、埋め込まれた原文を進捗管理に使います。 https://github.com/progit/progit2-ja/tree/master/book/01-introduction[第1章の訳文] を参考に、翻訳に使用した原文を訳文にも埋め込んでください。
825+-
826+-==== 翻訳後の作業
827+-
828+-以下の作業を行ってください。
829+-
830+-1. `status.json`の更新(コンテンツ自動生成時に使用されます)
831+-1. 作業完了の意思表示(該当のissueやPull Requestにコメントする)
832+\ ファイル末尾に改行がありません
791833 +As the work is translated, please update the `status.json` file to indicate the rough percentage complete each file is.
792834 +This will be shown on various pages to let people know how much work is left to be done.
793835 diff -au /tmp/book/01-introduction/sections/about-version-control.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/about-version-control.asc
794---- /tmp/book/01-introduction/sections/about-version-control.asc.tmp 2020-10-25 13:21:06.605924875 +0900
836+--- /tmp/book/01-introduction/sections/about-version-control.asc.tmp 2020-10-25 20:17:52.065325257 +0900
795837 +++ ../../git/progit2/progit2/book/01-introduction/sections/about-version-control.asc 2020-07-04 16:36:46.718685392 +0900
796838 @@ -1,57 +1,60 @@
797839 === About Version Control
@@ -870,7 +912,7 @@ diff -au /tmp/book/01-introduction/sections/about-version-control.asc.tmp ../../
870912
871913 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.
872914 diff -au /tmp/book/01-introduction/sections/command-line.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/command-line.asc
873---- /tmp/book/01-introduction/sections/command-line.asc.tmp 2020-10-25 13:21:06.612925247 +0900
915+--- /tmp/book/01-introduction/sections/command-line.asc.tmp 2020-10-25 20:17:52.117325976 +0900
874916 +++ ../../git/progit2/progit2/book/01-introduction/sections/command-line.asc 2020-06-28 16:44:50.920014615 +0900
875917 @@ -1,11 +1,11 @@
876918 === The Command Line
@@ -889,7 +931,7 @@ diff -au /tmp/book/01-introduction/sections/command-line.asc.tmp ../../git/progi
889931 +So we will expect you to know how to open Terminal in macOS or Command Prompt or PowerShell in Windows.
890932 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.
891933 diff -au /tmp/book/01-introduction/sections/first-time-setup.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/first-time-setup.asc
892---- /tmp/book/01-introduction/sections/first-time-setup.asc.tmp 2020-10-25 13:21:06.619925619 +0900
934+--- /tmp/book/01-introduction/sections/first-time-setup.asc.tmp 2020-10-25 20:17:52.137326253 +0900
893935 +++ ../../git/progit2/progit2/book/01-introduction/sections/first-time-setup.asc 2020-08-10 10:02:15.168231103 +0900
894936 @@ -1,4 +1,4 @@
895937 -[[r_first_time]]
@@ -1048,7 +1090,7 @@ diff -au /tmp/book/01-introduction/sections/first-time-setup.asc.tmp ../../git/p
10481090 +----
10491091 +====
10501092 diff -au /tmp/book/01-introduction/sections/help.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/help.asc
1051---- /tmp/book/01-introduction/sections/help.asc.tmp 2020-10-25 13:21:06.625925939 +0900
1093+--- /tmp/book/01-introduction/sections/help.asc.tmp 2020-10-25 20:17:52.180326847 +0900
10521094 +++ ../../git/progit2/progit2/book/01-introduction/sections/help.asc 2020-07-04 16:36:46.718685392 +0900
10531095 @@ -1,10 +1,48 @@
10541096 -[[r_git_help]]
@@ -1104,7 +1146,7 @@ diff -au /tmp/book/01-introduction/sections/help.asc.tmp ../../git/progit2/progi
11041146 +----
11051147 +
11061148 diff -au /tmp/book/01-introduction/sections/history.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/history.asc
1107---- /tmp/book/01-introduction/sections/history.asc.tmp 2020-10-25 13:21:06.632926311 +0900
1149+--- /tmp/book/01-introduction/sections/history.asc.tmp 2020-10-25 20:17:52.341329074 +0900
11081150 +++ ../../git/progit2/progit2/book/01-introduction/sections/history.asc 2020-06-28 16:44:50.921014763 +0900
11091151 @@ -17,4 +17,4 @@
11101152 * 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
11131155 -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>>).
11141156 +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>>).
11151157 diff -au /tmp/book/01-introduction/sections/installing.asc.tmp ../../git/progit2/progit2/book/01-introduction/sections/installing.asc
1116---- /tmp/book/01-introduction/sections/installing.asc.tmp 2020-10-25 13:21:06.638926630 +0900
1158+--- /tmp/book/01-introduction/sections/installing.asc.tmp 2020-10-25 20:17:52.437330401 +0900
11171159 +++ ../../git/progit2/progit2/book/01-introduction/sections/installing.asc 2020-07-04 16:36:46.718685392 +0900
11181160 @@ -4,72 +4,144 @@
11191161 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
12881330 +----
12891331 Warning: file not found: ../../git/progit2/progit2-ja/book/01-introduction/sections/what-is-git.asc
12901332 diff -au /tmp/book/02-git-basics/sections/aliases.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/aliases.asc
1291---- /tmp/book/02-git-basics/sections/aliases.asc.tmp 2020-10-25 13:21:06.645927003 +0900
1333+--- /tmp/book/02-git-basics/sections/aliases.asc.tmp 2020-10-25 20:17:52.647333305 +0900
12921334 +++ ../../git/progit2/progit2/book/02-git-basics/sections/aliases.asc 2020-07-03 19:43:27.508489967 +0900
12931335 @@ -1,28 +1,70 @@
12941336 -[[r_git_aliases]]
@@ -1365,7 +1407,7 @@ diff -au /tmp/book/02-git-basics/sections/aliases.asc.tmp ../../git/progit2/prog
13651407 +$ git config --global alias.visual '!gitk'
13661408 +----
13671409 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
1368---- /tmp/book/02-git-basics/sections/getting-a-repository.asc.tmp 2020-10-25 13:21:06.652927375 +0900
1410+--- /tmp/book/02-git-basics/sections/getting-a-repository.asc.tmp 2020-10-25 20:17:52.682333789 +0900
13691411 +++ ../../git/progit2/progit2/book/02-git-basics/sections/getting-a-repository.asc 2020-07-01 10:48:37.610009640 +0900
13701412 @@ -1,41 +1,87 @@
13711413 -[[r_getting_a_repo]]
@@ -1472,7 +1514,7 @@ diff -au /tmp/book/02-git-basics/sections/getting-a-repository.asc.tmp ../../git
14721514 -<<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.
14731515 +<<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.
14741516 diff -au /tmp/book/02-git-basics/sections/recording-changes.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/recording-changes.asc
1475---- /tmp/book/02-git-basics/sections/recording-changes.asc.tmp 2020-10-25 13:21:06.661927854 +0900
1517+--- /tmp/book/02-git-basics/sections/recording-changes.asc.tmp 2020-10-25 20:17:52.715334245 +0900
14761518 +++ ../../git/progit2/progit2/book/02-git-basics/sections/recording-changes.asc 2020-07-04 16:36:46.720685416 +0900
14771519 @@ -1,48 +1,91 @@
14781520 === Recording Changes to the Repository
@@ -2137,7 +2179,7 @@ diff -au /tmp/book/02-git-basics/sections/recording-changes.asc.tmp ../../git/pr
21372179 +The only real difference is that `git mv` is one command instead of three -- it's a convenience function.
21382180 More importantly, you can use any tool you like to rename a file, and address the add/rm later, before you commit.
21392181 diff -au /tmp/book/02-git-basics/sections/remotes.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/remotes.asc
2140---- /tmp/book/02-git-basics/sections/remotes.asc.tmp 2020-10-25 13:21:06.672928439 +0900
2182+--- /tmp/book/02-git-basics/sections/remotes.asc.tmp 2020-10-25 20:17:52.757334826 +0900
21412183 +++ ../../git/progit2/progit2/book/02-git-basics/sections/remotes.asc 2020-07-17 09:06:42.261936072 +0900
21422184 @@ -1,4 +1,4 @@
21432185 -[[r_remote_repos]]
@@ -2398,7 +2440,7 @@ diff -au /tmp/book/02-git-basics/sections/remotes.asc.tmp ../../git/progit2/prog
23982440 +
23992441 +Once you delete the reference to a remote this way, all remote-tracking branches and configuration settings associated with that remote are also deleted.
24002442 diff -au /tmp/book/02-git-basics/sections/tagging.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/tagging.asc
2401---- /tmp/book/02-git-basics/sections/tagging.asc.tmp 2020-10-25 13:21:06.680928864 +0900
2443+--- /tmp/book/02-git-basics/sections/tagging.asc.tmp 2020-10-25 20:17:52.820335697 +0900
24022444 +++ ../../git/progit2/progit2/book/02-git-basics/sections/tagging.asc 2020-08-29 09:58:24.048195629 +0900
24032445 @@ -1,77 +1,299 @@
24042446 -[[r_git_tagging]]
@@ -2719,7 +2761,7 @@ diff -au /tmp/book/02-git-basics/sections/tagging.asc.tmp ../../git/progit2/prog
27192761 -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.
27202762 +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.
27212763 diff -au /tmp/book/02-git-basics/sections/undoing.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/undoing.asc
2722---- /tmp/book/02-git-basics/sections/undoing.asc.tmp 2020-10-25 13:21:06.690929396 +0900
2764+--- /tmp/book/02-git-basics/sections/undoing.asc.tmp 2020-10-25 20:17:52.876336472 +0900
27232765 +++ ../../git/progit2/progit2/book/02-git-basics/sections/undoing.asc 2020-10-18 09:42:35.779991668 +0900
27242766 @@ -1,4 +1,4 @@
27252767 -[[r_undoing]]
@@ -2972,7 +3014,7 @@ diff -au /tmp/book/02-git-basics/sections/undoing.asc.tmp ../../git/progit2/prog
29723014 +Don't ever use this command unless you absolutely know that you don't want those unsaved local changes.
29733015 +=====
29743016 diff -au /tmp/book/02-git-basics/sections/viewing-history.asc.tmp ../../git/progit2/progit2/book/02-git-basics/sections/viewing-history.asc
2975---- /tmp/book/02-git-basics/sections/viewing-history.asc.tmp 2020-10-25 13:21:06.699929875 +0900
3017+--- /tmp/book/02-git-basics/sections/viewing-history.asc.tmp 2020-10-25 20:17:52.922337108 +0900
29763018 +++ ../../git/progit2/progit2/book/02-git-basics/sections/viewing-history.asc 2020-09-26 08:56:07.950296410 +0900
29773019 @@ -1,76 +1,213 @@
29783020 -[[r_viewing_history]]
@@ -3322,7 +3364,7 @@ diff -au /tmp/book/02-git-basics/sections/viewing-history.asc.tmp ../../git/prog
33223364 +To prevent the display of merge commits cluttering up your log history, simply add the log option `--no-merges`.
33233365 +====
33243366 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
3325---- /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp 2020-10-25 13:21:06.707930301 +0900
3367+--- /tmp/book/03-git-branching/sections/basic-branching-and-merging.asc.tmp 2020-10-25 20:17:53.010338324 +0900
33263368 +++ ../../git/progit2/progit2/book/03-git-branching/sections/basic-branching-and-merging.asc 2020-07-04 16:36:46.720685416 +0900
33273369 @@ -3,8 +3,8 @@
33283370 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
36753717 +
36763718 +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.
36773719 diff -au /tmp/book/03-git-branching/sections/branch-management.asc.tmp ../../git/progit2/progit2/book/03-git-branching/sections/branch-management.asc
3678---- /tmp/book/03-git-branching/sections/branch-management.asc.tmp 2020-10-25 13:21:06.716930779 +0900
3720+--- /tmp/book/03-git-branching/sections/branch-management.asc.tmp 2020-10-25 20:17:53.065339085 +0900
36793721 +++ ../../git/progit2/progit2/book/03-git-branching/sections/branch-management.asc 2020-09-12 09:27:13.221663700 +0900
36803722 @@ -1,4 +1,4 @@
36813723 -[[r_branch_management]]
@@ -3823,7 +3865,7 @@ diff -au /tmp/book/03-git-branching/sections/branch-management.asc.tmp ../../git
38233865 +$ git push origin --delete master
38243866 +----
38253867 diff -au /tmp/book/03-git-branching/sections/nutshell.asc.tmp ../../git/progit2/progit2/book/03-git-branching/sections/nutshell.asc
3826---- /tmp/book/03-git-branching/sections/nutshell.asc.tmp 2020-10-25 13:21:06.725931258 +0900
3868+--- /tmp/book/03-git-branching/sections/nutshell.asc.tmp 2020-10-25 20:17:53.114339763 +0900
38273869 +++ ../../git/progit2/progit2/book/03-git-branching/sections/nutshell.asc 2020-09-26 08:56:07.950296410 +0900
38283870 @@ -1,100 +1,150 @@
38293871 -[[r_git_branches_overview]]
@@ -4063,7 +4105,7 @@ diff -au /tmp/book/03-git-branching/sections/nutshell.asc.tmp ../../git/progit2/
40634105 +- Return to your previously checked out branch: `git switch -`.
40644106 +====
40654107 diff -au /tmp/book/03-git-branching/sections/rebasing.asc.tmp ../../git/progit2/progit2/book/03-git-branching/sections/rebasing.asc
4066---- /tmp/book/03-git-branching/sections/rebasing.asc.tmp 2020-10-25 13:21:06.735931790 +0900
4108+--- /tmp/book/03-git-branching/sections/rebasing.asc.tmp 2020-10-25 20:17:53.161340412 +0900
40674109 +++ ../../git/progit2/progit2/book/03-git-branching/sections/rebasing.asc 2020-08-17 16:38:51.075694960 +0900
40684110 @@ -1,94 +1,144 @@
40694111 -[[r_rebasing]]
@@ -4325,7 +4367,7 @@ diff -au /tmp/book/03-git-branching/sections/rebasing.asc.tmp ../../git/progit2/
43254367 -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.
43264368 +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.
43274369 diff -au /tmp/book/03-git-branching/sections/remote-branches.asc.tmp ../../git/progit2/progit2/book/03-git-branching/sections/remote-branches.asc
4328---- /tmp/book/03-git-branching/sections/remote-branches.asc.tmp 2020-10-25 13:21:06.744932269 +0900
4370+--- /tmp/book/03-git-branching/sections/remote-branches.asc.tmp 2020-10-25 20:17:53.227341325 +0900
43294371 +++ ../../git/progit2/progit2/book/03-git-branching/sections/remote-branches.asc 2020-07-04 16:36:46.723685453 +0900
43304372 @@ -1,23 +1,25 @@
43314373 -[[r_remote_branches]]
@@ -4604,7 +4646,7 @@ diff -au /tmp/book/03-git-branching/sections/remote-branches.asc.tmp ../../git/p
46044646 Basically all this does is remove the pointer from the server.
46054647 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.
46064648 diff -au /tmp/book/03-git-branching/sections/workflows.asc.tmp ../../git/progit2/progit2/book/03-git-branching/sections/workflows.asc
4607---- /tmp/book/03-git-branching/sections/workflows.asc.tmp 2020-10-25 13:21:06.753932747 +0900
4649+--- /tmp/book/03-git-branching/sections/workflows.asc.tmp 2020-10-25 20:17:53.264341837 +0900
46084650 +++ ../../git/progit2/progit2/book/03-git-branching/sections/workflows.asc 2020-07-04 16:36:46.723685453 +0900
46094651 @@ -1,35 +1,39 @@
46104652 === Branching Workflows
@@ -4680,7 +4722,7 @@ diff -au /tmp/book/03-git-branching/sections/workflows.asc.tmp ../../git/progit2
46804722 -When you're branching and merging, everything is being done only in your Git repository – no server communication is happening.
46814723 +When you're branching and merging, everything is being done only in your Git repository -- there is no communication with the server.
46824724 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
4683---- /tmp/book/04-git-server/sections/generating-ssh-key.asc.tmp 2020-10-25 13:21:06.760933120 +0900
4725+--- /tmp/book/04-git-server/sections/generating-ssh-key.asc.tmp 2020-10-25 20:17:53.332342777 +0900
46844726 +++ ../../git/progit2/progit2/book/04-git-server/sections/generating-ssh-key.asc 2020-08-05 13:56:11.288918669 +0900
46854727 @@ -1,21 +1,57 @@
46864728 -[[r_generate_ssh_key]]
@@ -4746,7 +4788,7 @@ diff -au /tmp/book/04-git-server/sections/generating-ssh-key.asc.tmp ../../git/p
47464788 +
47474789 +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[].
47484790 diff -au /tmp/book/04-git-server/sections/git-daemon.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/git-daemon.asc
4749---- /tmp/book/04-git-server/sections/git-daemon.asc.tmp 2020-10-25 13:21:06.770933652 +0900
4791+--- /tmp/book/04-git-server/sections/git-daemon.asc.tmp 2020-10-25 20:17:53.383343482 +0900
47504792 +++ ../../git/progit2/progit2/book/04-git-server/sections/git-daemon.asc 2020-06-28 16:44:50.925015352 +0900
47514793 @@ -1,33 +1,66 @@
47524794 === Git Daemon
@@ -4829,7 +4871,7 @@ diff -au /tmp/book/04-git-server/sections/git-daemon.asc.tmp ../../git/progit2/p
48294871 +
48304872 The presence of that file tells Git that it's OK to serve this project without authentication.
48314873 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
4832---- /tmp/book/04-git-server/sections/git-on-a-server.asc.tmp 2020-10-25 13:21:06.778934077 +0900
4874+--- /tmp/book/04-git-server/sections/git-on-a-server.asc.tmp 2020-10-25 20:17:53.433344174 +0900
48334875 +++ ../../git/progit2/progit2/book/04-git-server/sections/git-on-a-server.asc 2020-07-04 16:36:46.723685453 +0900
48344876 @@ -1,45 +1,74 @@
48354877 -[[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
49574999 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.
49585000 As long as each user can get shell access on the machine, any SSH authentication mechanism you can think of should work.
49595001 diff -au /tmp/book/04-git-server/sections/gitlab.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/gitlab.asc
4960---- /tmp/book/04-git-server/sections/gitlab.asc.tmp 2020-10-25 13:21:06.787934556 +0900
5002+--- /tmp/book/04-git-server/sections/gitlab.asc.tmp 2020-10-25 20:17:53.512345266 +0900
49615003 +++ ../../git/progit2/progit2/book/04-git-server/sections/gitlab.asc 2020-09-07 09:33:11.247683703 +0900
49625004 @@ -2,60 +2,63 @@
49635005
@@ -5135,7 +5177,7 @@ diff -au /tmp/book/04-git-server/sections/gitlab.asc.tmp ../../git/progit2/progi
51355177 -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.
51365178 +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.
51375179 diff -au /tmp/book/04-git-server/sections/gitweb.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/gitweb.asc
5138---- /tmp/book/04-git-server/sections/gitweb.asc.tmp 2020-10-25 13:21:06.793934875 +0900
5180+--- /tmp/book/04-git-server/sections/gitweb.asc.tmp 2020-10-25 20:17:53.530345515 +0900
51395181 +++ ../../git/progit2/progit2/book/04-git-server/sections/gitweb.asc 2020-07-04 16:36:46.723685453 +0900
51405182 @@ -4,25 +4,67 @@
51415183 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
52105252 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.
52115253 At this point, you should be able to visit `http://gitserver/` to view your repositories online.
52125254 diff -au /tmp/book/04-git-server/sections/hosted.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/hosted.asc
5213---- /tmp/book/04-git-server/sections/hosted.asc.tmp 2020-10-25 13:21:06.800935248 +0900
5255+--- /tmp/book/04-git-server/sections/hosted.asc.tmp 2020-10-25 20:17:53.539345639 +0900
52145256 +++ ../../git/progit2/progit2/book/04-git-server/sections/hosted.asc 2020-07-04 16:36:46.725685477 +0900
52155257 @@ -5,6 +5,6 @@
52165258 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
52215263
52225264 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.
52235265 diff -au /tmp/book/04-git-server/sections/protocols.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/protocols.asc
5224---- /tmp/book/04-git-server/sections/protocols.asc.tmp 2020-10-25 13:21:06.808935673 +0900
5266+--- /tmp/book/04-git-server/sections/protocols.asc.tmp 2020-10-25 20:17:53.552345819 +0900
52255267 +++ ../../git/progit2/progit2/book/04-git-server/sections/protocols.asc 2020-07-04 16:36:46.726685489 +0900
52265268 @@ -1,39 +1,55 @@
52275269 === The Protocols
@@ -5461,7 +5503,7 @@ diff -au /tmp/book/04-git-server/sections/protocols.asc.tmp ../../git/progit2/pr
54615503 It also requires firewall access to port 9418, which isn't a standard port that corporate firewalls always allow.
54625504 Behind big corporate firewalls, this obscure port is commonly blocked.
54635505 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
5464---- /tmp/book/04-git-server/sections/setting-up-server.asc.tmp 2020-10-25 13:21:06.817936152 +0900
5506+--- /tmp/book/04-git-server/sections/setting-up-server.asc.tmp 2020-10-25 20:17:53.564345985 +0900
54655507 +++ ../../git/progit2/progit2/book/04-git-server/sections/setting-up-server.asc 2020-06-28 16:44:50.927015646 +0900
54665508 @@ -1,41 +1,148 @@
54675509 -[[r_setting_up_server]]
@@ -5623,7 +5665,7 @@ diff -au /tmp/book/04-git-server/sections/setting-up-server.asc.tmp ../../git/pr
56235665 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.
56245666 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.
56255667 diff -au /tmp/book/04-git-server/sections/smart-http.asc.tmp ../../git/progit2/progit2/book/04-git-server/sections/smart-http.asc
5626---- /tmp/book/04-git-server/sections/smart-http.asc.tmp 2020-10-25 13:21:06.825936578 +0900
5668+--- /tmp/book/04-git-server/sections/smart-http.asc.tmp 2020-10-25 20:17:53.593346386 +0900
56275669 +++ ../../git/progit2/progit2/book/04-git-server/sections/smart-http.asc 2020-06-28 16:44:50.927015646 +0900
56285670 @@ -1,28 +1,62 @@
56295671 === Smart HTTP
@@ -5693,17 +5735,20 @@ diff -au /tmp/book/04-git-server/sections/smart-http.asc.tmp ../../git/progit2/p
56935735 There are tons of ways to have Apache authenticate users, you'll have to choose and implement one of them.
56945736 This is just the simplest example we could come up with.
56955737 You'll also almost certainly want to set this up over SSL so all this data is encrypted.
5696-@@ -32,6 +66,7 @@
5738+@@ -32,9 +66,7 @@
56975739 It does not implement any authentication itself, but that can easily be controlled at the layer of the web server that invokes it.
56985740 You can do this with nearly any CGI-capable web server, so go with the one that you know best.
56995741
57005742 +[NOTE]
57015743 ====
57025744 -For more information on configuring authentication in Apache, check out the Apache docs here: http://httpd.apache.org/docs/current/howto/auth.html[]
5745+-====
5746+-
5747+-====
57035748 +For more information on configuring authentication in Apache, check out the Apache docs here: https://httpd.apache.org/docs/current/howto/auth.html[]
57045749 ====
57055750 diff -au /tmp/book/05-distributed-git/sections/contributing.asc.tmp ../../git/progit2/progit2/book/05-distributed-git/sections/contributing.asc
5706---- /tmp/book/05-distributed-git/sections/contributing.asc.tmp 2020-10-25 13:21:06.837937216 +0900
5751+--- /tmp/book/05-distributed-git/sections/contributing.asc.tmp 2020-10-25 20:17:53.643347077 +0900
57075752 +++ ../../git/progit2/progit2/book/05-distributed-git/sections/contributing.asc 2020-08-29 09:58:24.050195768 +0900
57085753 @@ -1,11 +1,12 @@
57095754 -[[r_contributing_project]]
@@ -6641,7 +6686,7 @@ diff -au /tmp/book/05-distributed-git/sections/contributing.asc.tmp ../../git/pr
66416686 Next, you'll see how to work the other side of the coin: maintaining a Git project.
66426687 You'll learn how to be a benevolent dictator or integration manager.
66436688 diff -au /tmp/book/05-distributed-git/sections/distributed-workflows.asc.tmp ../../git/progit2/progit2/book/05-distributed-git/sections/distributed-workflows.asc
6644---- /tmp/book/05-distributed-git/sections/distributed-workflows.asc.tmp 2020-10-25 13:21:06.846937695 +0900
6689+--- /tmp/book/05-distributed-git/sections/distributed-workflows.asc.tmp 2020-10-25 20:17:53.702347893 +0900
66456690 +++ ../../git/progit2/progit2/book/05-distributed-git/sections/distributed-workflows.asc 2020-07-04 16:36:46.728685513 +0900
66466691 @@ -1,19 +1,21 @@
66476692 === Distributed Workflows
@@ -6764,7 +6809,7 @@ diff -au /tmp/book/05-distributed-git/sections/distributed-workflows.asc.tmp ../
67646809
67656810 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.
67666811 diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/progit2/progit2/book/05-distributed-git/sections/maintaining.asc
6767---- /tmp/book/05-distributed-git/sections/maintaining.asc.tmp 2020-10-25 13:21:06.856938227 +0900
6812+--- /tmp/book/05-distributed-git/sections/maintaining.asc.tmp 2020-10-25 20:17:53.768348806 +0900
67686813 +++ ../../git/progit2/progit2/book/05-distributed-git/sections/maintaining.asc 2020-07-07 09:30:48.190756402 +0900
67696814 @@ -1,64 +1,122 @@
67706815 === Maintaining a Project
@@ -7399,7 +7444,7 @@ diff -au /tmp/book/05-distributed-git/sections/maintaining.asc.tmp ../../git/pro
73997444 +
74007445 You get a clean summary of all the commits since v1.0.1, grouped by author, that you can email to your list.
74017446 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
7402---- /tmp/book/06-github/sections/1-setting-up-account.asc.tmp 2020-10-25 13:21:06.863938599 +0900
7447+--- /tmp/book/06-github/sections/1-setting-up-account.asc.tmp 2020-10-25 20:17:53.882350382 +0900
74037448 +++ ../../git/progit2/progit2/book/06-github/sections/1-setting-up-account.asc 2020-07-04 16:36:46.730685537 +0900
74047449 @@ -1,21 +1,22 @@
74057450 === Account Setup and Configuration
@@ -7501,7 +7546,7 @@ diff -au /tmp/book/06-github/sections/1-setting-up-account.asc.tmp ../../git/pro
75017546 The second address is verified and so can be set as the primary if you wish to switch them.
75027547 The final address is unverified, meaning that you can't make it your primary address.
75037548 diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/progit2/book/06-github/sections/2-contributing.asc
7504---- /tmp/book/06-github/sections/2-contributing.asc.tmp 2020-10-25 13:21:06.875939238 +0900
7549+--- /tmp/book/06-github/sections/2-contributing.asc.tmp 2020-10-25 20:17:53.910350769 +0900
75057550 +++ ../../git/progit2/progit2/book/06-github/sections/2-contributing.asc 2020-09-30 09:43:39.046514305 +0900
75067551 @@ -4,77 +4,131 @@
75077552
@@ -8158,7 +8203,7 @@ diff -au /tmp/book/06-github/sections/2-contributing.asc.tmp ../../git/progit2/p
81588203 +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.
81598204 +So you'll have to take care never to commit directly to `master`, since that branch effectively belongs to the upstream repository.
81608205 diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/progit2/book/06-github/sections/3-maintaining.asc
8161---- /tmp/book/06-github/sections/3-maintaining.asc.tmp 2020-10-25 13:21:06.885939770 +0900
8206+--- /tmp/book/06-github/sections/3-maintaining.asc.tmp 2020-10-25 20:17:53.958351433 +0900
81628207 +++ ../../git/progit2/progit2/book/06-github/sections/3-maintaining.asc 2020-07-04 16:36:46.732685561 +0900
81638208 @@ -1,4 +1,4 @@
81648209 -[[r_maintaining_gh_project]]
@@ -8512,7 +8557,7 @@ diff -au /tmp/book/06-github/sections/3-maintaining.asc.tmp ../../git/progit2/pr
85128557
85138558 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.
85148559 diff -au /tmp/book/06-github/sections/4-managing-organization.asc.tmp ../../git/progit2/progit2/book/06-github/sections/4-managing-organization.asc
8515---- /tmp/book/06-github/sections/4-managing-organization.asc.tmp 2020-10-25 13:21:06.893940195 +0900
8560+--- /tmp/book/06-github/sections/4-managing-organization.asc.tmp 2020-10-25 20:17:54.026352373 +0900
85168561 +++ ../../git/progit2/progit2/book/06-github/sections/4-managing-organization.asc 2020-07-04 16:36:46.732685561 +0900
85178562 @@ -1,6 +1,7 @@
85188563 -[[r_github_orgs]]
@@ -8580,7 +8625,7 @@ diff -au /tmp/book/06-github/sections/4-managing-organization.asc.tmp ../../git/
85808625
85818626 You can also filter down to specific types of events, specific places or specific people.
85828627 diff -au /tmp/book/06-github/sections/5-scripting.asc.tmp ../../git/progit2/progit2/book/06-github/sections/5-scripting.asc
8583---- /tmp/book/06-github/sections/5-scripting.asc.tmp 2020-10-25 13:21:06.902940674 +0900
8628+--- /tmp/book/06-github/sections/5-scripting.asc.tmp 2020-10-25 20:17:54.050352705 +0900
85848629 +++ ../../git/progit2/progit2/book/06-github/sections/5-scripting.asc 2020-07-04 16:36:46.733685573 +0900
85858630 @@ -5,7 +5,7 @@
85868631 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
87878832 Hopefully these tools can help you customize and modify GitHub to work better for your specific workflows.
87888833 For complete documentation on the entire API as well as guides for common tasks, check out https://developer.github.com[].
87898834 diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/advanced-merging.asc
8790---- /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp 2020-10-25 13:21:06.914941312 +0900
8835+--- /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp 2020-10-25 20:17:54.146354033 +0900
87918836 +++ ../../git/progit2/progit2/book/07-git-tools/sections/advanced-merging.asc 2020-07-04 16:36:46.733685573 +0900
87928837 @@ -1,4 +1,4 @@
87938838 -[[r_advanced_merging]]
@@ -9410,7 +9455,7 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
94109455 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''.
94119456 However, all the other non-conflicting changes on that branch are merged successfully in.
94129457
9413-@@ -271,9 +664,19 @@
9458+@@ -271,6 +664,14 @@
94149459 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.
94159460 It will simply record as the result of the merge the exact code in your current branch.
94169461
@@ -9425,13 +9470,8 @@ diff -au /tmp/book/07-git-tools/sections/advanced-merging.asc.tmp ../../git/prog
94259470 You can see that there is no difference between the branch we were on and the result of the merge.
94269471
94279472 This can often be useful to basically trick Git into thinking that a branch is already merged when doing a merge later on.
9428- 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.
9429- In the meantime some bugfix on `master` needs to be backported into your `release` branch.
9430- 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.
9431-+
9432-+include::subtree-merges.asc[]
94339473 diff -au /tmp/book/07-git-tools/sections/bundling.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/bundling.asc
9434---- /tmp/book/07-git-tools/sections/bundling.asc.tmp 2020-10-25 13:21:06.922941738 +0900
9474+--- /tmp/book/07-git-tools/sections/bundling.asc.tmp 2020-10-25 20:17:54.194354697 +0900
94359475 +++ ../../git/progit2/progit2/book/07-git-tools/sections/bundling.asc 2020-06-28 16:44:50.939017414 +0900
94369476 @@ -1,4 +1,4 @@
94379477 -[[r_bundling]]
@@ -9600,7 +9640,7 @@ diff -au /tmp/book/07-git-tools/sections/bundling.asc.tmp ../../git/progit2/prog
96009640
96019641 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.
96029642 diff -au /tmp/book/07-git-tools/sections/credentials.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/credentials.asc
9603---- /tmp/book/07-git-tools/sections/credentials.asc.tmp 2020-10-25 13:21:06.928942057 +0900
9643+--- /tmp/book/07-git-tools/sections/credentials.asc.tmp 2020-10-25 20:17:54.243355374 +0900
96049644 +++ ../../git/progit2/progit2/book/07-git-tools/sections/credentials.asc 2020-06-28 16:44:50.939017414 +0900
96059645 @@ -1,6 +1,8 @@
96069646 -[[r_credential_caching]]
@@ -9756,7 +9796,7 @@ diff -au /tmp/book/07-git-tools/sections/credentials.asc.tmp ../../git/progit2/p
97569796 +
97579797 As you can see, extending this system is pretty straightforward, and can solve some common problems for you and your team.
97589798 diff -au /tmp/book/07-git-tools/sections/debugging.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/debugging.asc
9759---- /tmp/book/07-git-tools/sections/debugging.asc.tmp 2020-10-25 13:21:06.934942377 +0900
9799+--- /tmp/book/07-git-tools/sections/debugging.asc.tmp 2020-10-25 20:17:54.295356093 +0900
97609800 +++ ../../git/progit2/progit2/book/07-git-tools/sections/debugging.asc 2020-06-28 16:44:50.939017414 +0900
97619801 @@ -1,62 +1,149 @@
97629802 === Debugging with Git
@@ -9928,7 +9968,7 @@ diff -au /tmp/book/07-git-tools/sections/debugging.asc.tmp ../../git/progit2/pro
99289968 Doing so automatically runs `test-error.sh` on each checked-out commit until Git finds the first broken commit.
99299969 You can also run something like `make` or `make tests` or whatever you have that runs automated tests for you.
99309970 diff -au /tmp/book/07-git-tools/sections/interactive-staging.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/interactive-staging.asc
9931---- /tmp/book/07-git-tools/sections/interactive-staging.asc.tmp 2020-10-25 13:21:06.946943015 +0900
9971+--- /tmp/book/07-git-tools/sections/interactive-staging.asc.tmp 2020-10-25 20:17:54.339356702 +0900
99329972 +++ ../../git/progit2/progit2/book/07-git-tools/sections/interactive-staging.asc 2020-06-28 16:44:50.939017414 +0900
99339973 @@ -1,57 +1,204 @@
99349974 -[[r_interactive_staging]]
@@ -10161,7 +10201,7 @@ diff -au /tmp/book/07-git-tools/sections/interactive-staging.asc.tmp ../../git/p
1016110201 +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.
1016210202 We'll go into more details on each of these as we get to more advanced usages of these commands.
1016310203 diff -au /tmp/book/07-git-tools/sections/replace.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/replace.asc
10164---- /tmp/book/07-git-tools/sections/replace.asc.tmp 2020-10-25 13:21:06.954943440 +0900
10204+--- /tmp/book/07-git-tools/sections/replace.asc.tmp 2020-10-25 20:17:54.352356881 +0900
1016510205 +++ ../../git/progit2/progit2/book/07-git-tools/sections/replace.asc 2020-07-04 16:36:46.733685573 +0900
1016610206 @@ -1,13 +1,13 @@
1016710207 -[[r_replace]]
@@ -10381,7 +10421,7 @@ diff -au /tmp/book/07-git-tools/sections/replace.asc.tmp ../../git/progit2/progi
1038110421 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.
1038210422 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.
1038310423 diff -au /tmp/book/07-git-tools/sections/rerere.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/rerere.asc
10384---- /tmp/book/07-git-tools/sections/rerere.asc.tmp 2020-10-25 13:21:06.960943760 +0900
10424+--- /tmp/book/07-git-tools/sections/rerere.asc.tmp 2020-10-25 20:17:54.364357047 +0900
1038510425 +++ ../../git/progit2/progit2/book/07-git-tools/sections/rerere.asc 2020-06-28 16:44:50.940017561 +0900
1038610426 @@ -1,68 +1,252 @@
1038710427 -[[r_rerere]]
@@ -10657,7 +10697,7 @@ diff -au /tmp/book/07-git-tools/sections/rerere.asc.tmp ../../git/progit2/progit
1065710697 +
1065810698 +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.
1065910699 diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/reset.asc
10660---- /tmp/book/07-git-tools/sections/reset.asc.tmp 2020-10-25 13:21:06.969944238 +0900
10700+--- /tmp/book/07-git-tools/sections/reset.asc.tmp 2020-10-25 20:17:54.391357421 +0900
1066110701 +++ ../../git/progit2/progit2/book/07-git-tools/sections/reset.asc 2020-07-04 16:36:46.733685573 +0900
1066210702 @@ -1,16 +1,16 @@
1066310703 -[[r_git_reset]]
@@ -11006,7 +11046,7 @@ diff -au /tmp/book/07-git-tools/sections/reset.asc.tmp ../../git/progit2/progit2
1100611046 +| `checkout [commit] <paths>` | NO | YES | YES | *NO*
1100711047 |================================
1100811048 diff -au /tmp/book/07-git-tools/sections/revision-selection.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/revision-selection.asc
11009---- /tmp/book/07-git-tools/sections/revision-selection.asc.tmp 2020-10-25 13:21:06.977944664 +0900
11049+--- /tmp/book/07-git-tools/sections/revision-selection.asc.tmp 2020-10-25 20:17:54.439358084 +0900
1101011050 +++ ../../git/progit2/progit2/book/07-git-tools/sections/revision-selection.asc 2020-10-24 08:43:10.529548324 +0900
1101111051 @@ -1,36 +1,76 @@
1101211052 -[[r_revision_selection]]
@@ -11479,7 +11519,7 @@ diff -au /tmp/book/07-git-tools/sections/revision-selection.asc.tmp ../../git/pr
1147911519
1148011520 With these tools, you can much more easily let Git know what commit or commits you want to inspect.
1148111521 diff -au /tmp/book/07-git-tools/sections/rewriting-history.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/rewriting-history.asc
11482---- /tmp/book/07-git-tools/sections/rewriting-history.asc.tmp 2020-10-25 13:21:06.989945302 +0900
11522+--- /tmp/book/07-git-tools/sections/rewriting-history.asc.tmp 2020-10-25 20:17:54.487358748 +0900
1148311523 +++ ../../git/progit2/progit2/book/07-git-tools/sections/rewriting-history.asc 2020-09-12 09:27:13.222663694 +0900
1148411524 @@ -1,114 +1,346 @@
1148511525 -[[r_rewriting_history]]
@@ -11918,7 +11958,7 @@ diff -au /tmp/book/07-git-tools/sections/rewriting-history.asc.tmp ../../git/pro
1191811958 This goes through and rewrites every commit to have your new address.
1191911959 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.
1192011960 diff -au /tmp/book/07-git-tools/sections/searching.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/searching.asc
11921---- /tmp/book/07-git-tools/sections/searching.asc.tmp 2020-10-25 13:21:06.994945568 +0900
11961+--- /tmp/book/07-git-tools/sections/searching.asc.tmp 2020-10-25 20:17:54.529359329 +0900
1192211962 +++ ../../git/progit2/progit2/book/07-git-tools/sections/searching.asc 2020-06-28 16:44:50.941017708 +0900
1192311963 @@ -1,30 +1,91 @@
1192411964 -[[r_searching]]
@@ -12107,7 +12147,7 @@ diff -au /tmp/book/07-git-tools/sections/searching.asc.tmp ../../git/progit2/pro
1210712147 +For example, this would have done the same thing as the example above: `git log -L '/unsigned long git_deflate_bound/',/^}/:zlib.c`.
1210812148 You could also give it a range of lines or a single line number and you'll get the same sort of output.
1210912149 diff -au /tmp/book/07-git-tools/sections/signing.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/signing.asc
12110---- /tmp/book/07-git-tools/sections/signing.asc.tmp 2020-10-25 13:21:07.002945994 +0900
12150+--- /tmp/book/07-git-tools/sections/signing.asc.tmp 2020-10-25 20:17:54.576359979 +0900
1211112151 +++ ../../git/progit2/progit2/book/07-git-tools/sections/signing.asc 2020-06-28 16:44:50.941017708 +0900
1211212152 @@ -1,4 +1,4 @@
1211312153 -[[r_signing]]
@@ -12316,7 +12356,7 @@ diff -au /tmp/book/07-git-tools/sections/signing.asc.tmp ../../git/progit2/progi
1231612356
1231712357 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.
1231812358 diff -au /tmp/book/07-git-tools/sections/stashing-cleaning.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/stashing-cleaning.asc
12319---- /tmp/book/07-git-tools/sections/stashing-cleaning.asc.tmp 2020-10-25 13:21:07.011946473 +0900
12359+--- /tmp/book/07-git-tools/sections/stashing-cleaning.asc.tmp 2020-10-25 20:17:54.601360324 +0900
1232012360 +++ ../../git/progit2/progit2/book/07-git-tools/sections/stashing-cleaning.asc 2020-06-28 16:44:50.941017708 +0900
1232112361 @@ -1,72 +1,234 @@
1232212362 -[[r_git_stashing]]
@@ -12645,7 +12685,7 @@ diff -au /tmp/book/07-git-tools/sections/stashing-cleaning.asc.tmp ../../git/pro
1264512685 +In cases like that, you need to add a second `-f` option for emphasis.
1264612686 +====
1264712687 diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/submodules.asc
12648---- /tmp/book/07-git-tools/sections/submodules.asc.tmp 2020-10-25 13:21:07.024947164 +0900
12688+--- /tmp/book/07-git-tools/sections/submodules.asc.tmp 2020-10-25 20:17:54.637360822 +0900
1264912689 +++ ../../git/progit2/progit2/book/07-git-tools/sections/submodules.asc 2020-07-21 09:34:56.067548780 +0900
1265012690 @@ -1,21 +1,22 @@
1265112691 -[[r_git_submodules]]
@@ -13695,7 +13735,7 @@ diff -au /tmp/book/07-git-tools/sections/submodules.asc.tmp ../../git/progit2/pr
1369513735 You may need to go into your submodule directory and run a `git checkout .` to get all your files back.
1369613736 You could run this in a `submodule foreach` script to run it for multiple submodules.
1369713737 diff -au /tmp/book/07-git-tools/sections/subtree-merges.asc.tmp ../../git/progit2/progit2/book/07-git-tools/sections/subtree-merges.asc
13698---- /tmp/book/07-git-tools/sections/subtree-merges.asc.tmp 2020-10-25 13:21:07.032947590 +0900
13738+--- /tmp/book/07-git-tools/sections/subtree-merges.asc.tmp 2020-10-25 20:17:54.706361776 +0900
1369913739 +++ ../../git/progit2/progit2/book/07-git-tools/sections/subtree-merges.asc 2020-07-04 16:36:46.737685622 +0900
1370013740 @@ -1,4 +1,4 @@
1370113741 -[[r_subtree_merge]]
@@ -13806,7 +13846,7 @@ diff -au /tmp/book/07-git-tools/sections/subtree-merges.asc.tmp ../../git/progit
1380613846 +$ git diff-tree -p rack_remote/master
1380713847 +----
1380813848 diff -au /tmp/book/08-customizing-git/sections/attributes.asc.tmp ../../git/progit2/progit2/book/08-customizing-git/sections/attributes.asc
13809---- /tmp/book/08-customizing-git/sections/attributes.asc.tmp 2020-10-25 13:21:07.043948175 +0900
13849+--- /tmp/book/08-customizing-git/sections/attributes.asc.tmp 2020-10-25 20:17:54.787362897 +0900
1381013850 +++ ../../git/progit2/progit2/book/08-customizing-git/sections/attributes.asc 2020-07-04 16:36:46.738685634 +0900
1381113851 @@ -1,5 +1,6 @@
1381213852 === Git Attributes
@@ -14186,7 +14226,7 @@ diff -au /tmp/book/08-customizing-git/sections/attributes.asc.tmp ../../git/prog
1418614226 +
1418714227 In this case, `database.xml` stays at whatever version you originally had.
1418814228 diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/progit2/book/08-customizing-git/sections/config.asc
14189---- /tmp/book/08-customizing-git/sections/config.asc.tmp 2020-10-25 13:21:07.057948919 +0900
14229+--- /tmp/book/08-customizing-git/sections/config.asc.tmp 2020-10-25 20:17:54.848363750 +0900
1419014230 +++ ../../git/progit2/progit2/book/08-customizing-git/sections/config.asc 2020-08-10 10:02:15.170231399 +0900
1419114231 @@ -1,97 +1,202 @@
1419214232 -[[r_git_config]]
@@ -14720,7 +14760,7 @@ diff -au /tmp/book/08-customizing-git/sections/config.asc.tmp ../../git/progit2/
1472014760 -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>>.
1472114761 +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>>.
1472214762 diff -au /tmp/book/08-customizing-git/sections/hooks.asc.tmp ../../git/progit2/progit2/book/08-customizing-git/sections/hooks.asc
14723---- /tmp/book/08-customizing-git/sections/hooks.asc.tmp 2020-10-25 13:21:07.066949398 +0900
14763+--- /tmp/book/08-customizing-git/sections/hooks.asc.tmp 2020-10-25 20:17:54.915364687 +0900
1472414764 +++ ../../git/progit2/progit2/book/08-customizing-git/sections/hooks.asc 2020-09-26 08:56:07.952296414 +0900
1472514765 @@ -1,6 +1,7 @@
1472614766 -[[r_git_hooks]]
@@ -14786,7 +14826,7 @@ diff -au /tmp/book/08-customizing-git/sections/hooks.asc.tmp ../../git/progit2/p
1478614826 +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.
1478714827 +====
1478814828 diff -au /tmp/book/08-customizing-git/sections/policy.asc.tmp ../../git/progit2/progit2/book/08-customizing-git/sections/policy.asc
14789---- /tmp/book/08-customizing-git/sections/policy.asc.tmp 2020-10-25 13:21:07.075949877 +0900
14829+--- /tmp/book/08-customizing-git/sections/policy.asc.tmp 2020-10-25 20:17:54.984365650 +0900
1479014830 +++ ../../git/progit2/progit2/book/08-customizing-git/sections/policy.asc 2020-07-04 16:36:46.738685634 +0900
1479114831 @@ -1,6 +1,7 @@
1479214832 -[[r_an_example_git_enforced_policy]]
@@ -15197,7 +15237,7 @@ diff -au /tmp/book/08-customizing-git/sections/policy.asc.tmp ../../git/progit2/
1519715237 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.
1519815238 Warning: file not found: ../../git/progit2/progit2-ja/book/09-git-and-other-scms/sections/client-bzr.asc
1519915239 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
15200---- /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp 2020-10-25 13:21:07.085950409 +0900
15240+--- /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp 2020-10-25 20:17:55.062366743 +0900
1520115241 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/client-hg.asc 2020-07-01 10:48:37.622009668 +0900
1520215242 @@ -1,5 +1,7 @@
1520315243 ==== Git and Mercurial
@@ -15583,7 +15623,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-hg.asc.tmp ../../git/pr
1558315623
1558415624 Git and Mercurial are similar enough that working across the boundary is fairly painless.
1558515625 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
15586---- /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp 2020-10-25 13:21:07.096950994 +0900
15626+--- /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp 2020-10-25 20:17:55.124367614 +0900
1558715627 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/client-p4.asc 2020-07-04 16:36:46.740685658 +0900
1558815628 @@ -1,5 +1,7 @@
1558915629 ==== Git and Perforce
@@ -16216,7 +16256,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-p4.asc.tmp ../../git/pr
1621616256
1621716257 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`.
1621816258 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
16219---- /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp 2020-10-25 13:21:07.104951419 +0900
16259+--- /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp 2020-10-25 20:17:55.181368414 +0900
1622016260 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/client-svn.asc 2020-07-04 16:36:46.740685658 +0900
1622116261 @@ -1,10 +1,12 @@
1622216262 -[[r_git_svn]]
@@ -16669,7 +16709,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/client-svn.asc.tmp ../../git/p
1666916709
1667016710 Warning: file not found: ../../git/progit2/progit2-ja/book/09-git-and-other-scms/sections/import-bzr.asc
1667116711 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
16672---- /tmp/book/09-git-and-other-scms/sections/import-custom.asc.tmp 2020-10-25 13:21:07.115952004 +0900
16712+--- /tmp/book/09-git-and-other-scms/sections/import-custom.asc.tmp 2020-10-25 20:17:55.227369059 +0900
1667316713 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-custom.asc 2020-06-28 16:44:50.946018445 +0900
1667416714 @@ -1,4 +1,4 @@
1667516715 -[[r_custom_importer]]
@@ -17042,7 +17082,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/import-custom.asc.tmp ../../gi
1704217082 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.
1704317083 A number of examples of more complex scenarios are available in the `contrib/fast-import` directory of the Git source code.
1704417084 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
17045---- /tmp/book/09-git-and-other-scms/sections/import-hg.asc.tmp 2020-10-25 13:21:07.124952483 +0900
17085+--- /tmp/book/09-git-and-other-scms/sections/import-hg.asc.tmp 2020-10-25 20:17:55.270369662 +0900
1704617086 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-hg.asc 2020-06-28 16:44:50.947018592 +0900
1704717087 @@ -3,25 +3,122 @@
1704817088 (((Mercurial)))(((Importing, from Mercurial)))
@@ -17170,7 +17210,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/import-hg.asc.tmp ../../git/pr
1717017210 +$ git push origin --all
1717117211 +----
1717217212 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
17173---- /tmp/book/09-git-and-other-scms/sections/import-p4.asc.tmp 2020-10-25 13:21:07.136953121 +0900
17213+--- /tmp/book/09-git-and-other-scms/sections/import-p4.asc.tmp 2020-10-25 20:17:55.316370306 +0900
1717417214 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-p4.asc 2020-06-28 16:44:50.947018592 +0900
1717517215 @@ -1,4 +1,4 @@
1717617216 -[[r_perforce_import]]
@@ -17280,7 +17320,7 @@ diff -au /tmp/book/09-git-and-other-scms/sections/import-p4.asc.tmp ../../git/pr
1728017320 +
1728117321 Your import is ready to push up to your new Git server.
1728217322 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
17283---- /tmp/book/09-git-and-other-scms/sections/import-svn.asc.tmp 2020-10-25 13:21:07.146953653 +0900
17323+--- /tmp/book/09-git-and-other-scms/sections/import-svn.asc.tmp 2020-10-25 20:17:55.361370939 +0900
1728417324 +++ ../../git/progit2/progit2/book/09-git-and-other-scms/sections/import-svn.asc 2020-07-04 16:36:46.743685694 +0900
1728517325 @@ -12,21 +12,76 @@
1728617326 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
1742117461 +
1742217462 All your branches and tags should be on your new Git server in a nice, clean import.
1742317463 diff -au /tmp/book/10-git-internals/sections/environment.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/environment.asc
17424---- /tmp/book/10-git-internals/sections/environment.asc.tmp 2020-10-25 13:21:07.155954132 +0900
17464+--- /tmp/book/10-git-internals/sections/environment.asc.tmp 2020-10-25 20:17:55.448372159 +0900
1742517465 +++ ../../git/progit2/progit2/book/10-git-internals/sections/environment.asc 2020-07-01 10:48:37.623009671 +0900
1742617466 @@ -4,6 +4,7 @@
1742717467 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
1760517645 +9e3d55a HEAD@{0}: my action: My message
1760617646 +----
1760717647 diff -au /tmp/book/10-git-internals/sections/maintenance.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/maintenance.asc
17608---- /tmp/book/10-git-internals/sections/maintenance.asc.tmp 2020-10-25 13:21:07.164954610 +0900
17648+--- /tmp/book/10-git-internals/sections/maintenance.asc.tmp 2020-10-25 20:17:55.498372861 +0900
1760917649 +++ ../../git/progit2/progit2/book/10-git-internals/sections/maintenance.asc 2020-06-28 16:44:50.948018739 +0900
1761017650 @@ -3,6 +3,7 @@
1761117651 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
1794417984 +size-garbage: 0
1794517985 +----
1794617986 diff -au /tmp/book/10-git-internals/sections/objects.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/objects.asc
17947---- /tmp/book/10-git-internals/sections/objects.asc.tmp 2020-10-25 13:21:07.175955196 +0900
17987+--- /tmp/book/10-git-internals/sections/objects.asc.tmp 2020-10-25 20:17:55.549373576 +0900
1794817988 +++ ../../git/progit2/progit2/book/10-git-internals/sections/objects.asc 2020-07-04 16:36:46.743685694 +0900
1794917989 @@ -1,159 +1,438 @@
1795017990 -[[r_objects]]
@@ -18431,7 +18471,7 @@ diff -au /tmp/book/10-git-internals/sections/objects.asc.tmp ../../git/progit2/p
1843118471 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.
1843218472 Also, although the blob content can be nearly anything, the commit and tree content are very specifically formatted.
1843318473 diff -au /tmp/book/10-git-internals/sections/packfiles.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/packfiles.asc
18434---- /tmp/book/10-git-internals/sections/packfiles.asc.tmp 2020-10-25 13:21:07.184955674 +0900
18474+--- /tmp/book/10-git-internals/sections/packfiles.asc.tmp 2020-10-25 20:17:55.609374419 +0900
1843518475 +++ ../../git/progit2/progit2/book/10-git-internals/sections/packfiles.asc 2020-06-28 16:44:50.948018739 +0900
1843618476 @@ -1,25 +1,87 @@
1843718477 === Packfiles
@@ -18616,7 +18656,7 @@ diff -au /tmp/book/10-git-internals/sections/packfiles.asc.tmp ../../git/progit2
1861618656 The really nice thing about this is that it can be repacked at any time.
1861718657 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.
1861818658 diff -au /tmp/book/10-git-internals/sections/plumbing-porcelain.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/plumbing-porcelain.asc
18619---- /tmp/book/10-git-internals/sections/plumbing-porcelain.asc.tmp 2020-10-25 13:21:07.193956153 +0900
18659+--- /tmp/book/10-git-internals/sections/plumbing-porcelain.asc.tmp 2020-10-25 20:17:55.673375319 +0900
1862018660 +++ ../../git/progit2/progit2/book/10-git-internals/sections/plumbing-porcelain.asc 2020-06-28 16:44:50.950019034 +0900
1862118661 @@ -1,25 +1,37 @@
1862218662 -[[r_plumbing_porcelain]]
@@ -18669,7 +18709,7 @@ diff -au /tmp/book/10-git-internals/sections/plumbing-porcelain.asc.tmp ../../gi
1866918709 +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.
1867018710 You'll now look at each of these sections in detail to see how Git operates.
1867118711 diff -au /tmp/book/10-git-internals/sections/refs.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/refs.asc
18672---- /tmp/book/10-git-internals/sections/refs.asc.tmp 2020-10-25 13:21:07.201956579 +0900
18712+--- /tmp/book/10-git-internals/sections/refs.asc.tmp 2020-10-25 20:17:55.721375990 +0900
1867318713 +++ ../../git/progit2/progit2/book/10-git-internals/sections/refs.asc 2020-07-04 16:36:46.743685694 +0900
1867418714 @@ -1,78 +1,182 @@
1867518715 -[[r_git_refs]]
@@ -18906,7 +18946,7 @@ diff -au /tmp/book/10-git-internals/sections/refs.asc.tmp ../../git/progit2/prog
1890618946 You can `git checkout` to one, but Git won't point HEAD at one, so you'll never update it with a `commit` command.
1890718947 Git manages them as bookmarks to the last known state of where those branches were on those servers.
1890818948 diff -au /tmp/book/10-git-internals/sections/refspec.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/refspec.asc
18909---- /tmp/book/10-git-internals/sections/refspec.asc.tmp 2020-10-25 13:21:07.208956951 +0900
18949+--- /tmp/book/10-git-internals/sections/refspec.asc.tmp 2020-10-25 20:17:55.762376565 +0900
1891018950 +++ ../../git/progit2/progit2/book/10-git-internals/sections/refspec.asc 2020-07-04 16:36:46.743685694 +0900
1891118951 @@ -1,56 +1,145 @@
1891218952 -[[r_refspec]]
@@ -19071,7 +19111,7 @@ diff -au /tmp/book/10-git-internals/sections/refspec.asc.tmp ../../git/progit2/p
1907119111 +$ git push origin --delete topic
1907219112 +----
1907319113 diff -au /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp ../../git/progit2/progit2/book/10-git-internals/sections/transfer-protocols.asc
19074---- /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp 2020-10-25 13:21:07.217957430 +0900
19114+--- /tmp/book/10-git-internals/sections/transfer-protocols.asc.tmp 2020-10-25 20:17:55.813377280 +0900
1907519115 +++ ../../git/progit2/progit2/book/10-git-internals/sections/transfer-protocols.asc 2020-06-28 16:44:50.950019034 +0900
1907619116 @@ -8,58 +8,117 @@
1907719117 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
1935319393 The response to this request indicates success or failure, and includes the packfile.
1935419394
1935519395 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
19356---- /tmp/book/A-git-in-other-environments/sections/bash.asc.tmp 2020-10-25 13:21:07.228958015 +0900
19396+--- /tmp/book/A-git-in-other-environments/sections/bash.asc.tmp 2020-10-25 20:17:55.891378377 +0900
1935719397 +++ ../../git/progit2/progit2/book/A-git-in-other-environments/sections/bash.asc 2020-07-04 16:36:46.743685694 +0900
1935819398 @@ -1,12 +1,23 @@
1935919399 === Git in Bash
@@ -19401,7 +19441,7 @@ diff -au /tmp/book/A-git-in-other-environments/sections/bash.asc.tmp ../../git/p
1940119441
1940219442 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.
1940319443 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
19404---- /tmp/book/A-git-in-other-environments/sections/guis.asc.tmp 2020-10-25 13:21:07.236958440 +0900
19444+--- /tmp/book/A-git-in-other-environments/sections/guis.asc.tmp 2020-10-25 20:17:55.939379048 +0900
1940519445 +++ ../../git/progit2/progit2/book/A-git-in-other-environments/sections/guis.asc 2020-07-04 16:36:46.743685694 +0900
1940619446 @@ -1,5 +1,6 @@
1940719447 === Graphical Interfaces
@@ -19546,7 +19586,7 @@ diff -au /tmp/book/A-git-in-other-environments/sections/guis.asc.tmp ../../git/p
1954619586 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[].
1954719587 Warning: file not found: ../../git/progit2/progit2-ja/book/A-git-in-other-environments/sections/jetbrainsides.asc
1954819588 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
19549---- /tmp/book/A-git-in-other-environments/sections/powershell.asc.tmp 2020-10-25 13:21:07.246958972 +0900
19589+--- /tmp/book/A-git-in-other-environments/sections/powershell.asc.tmp 2020-10-25 20:17:55.990379766 +0900
1955019590 +++ ../../git/progit2/progit2/book/A-git-in-other-environments/sections/powershell.asc 2020-07-04 16:36:46.743685694 +0900
1955119591 @@ -1,16 +1,86 @@
1955219592 -[[r_git_powershell]]
@@ -19647,7 +19687,7 @@ diff -au /tmp/book/A-git-in-other-environments/sections/powershell.asc.tmp ../..
1964719687 +For more details on how to customize your posh-git prompt see: https://github.com/dahlbyk/posh-git/blob/master/README.md#customization-variables[].
1964819688 Warning: file not found: ../../git/progit2/progit2-ja/book/A-git-in-other-environments/sections/sublimetext.asc
1964919689 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
19650---- /tmp/book/A-git-in-other-environments/sections/visualstudio.asc.tmp 2020-10-25 13:21:07.254959398 +0900
19690+--- /tmp/book/A-git-in-other-environments/sections/visualstudio.asc.tmp 2020-10-25 20:17:56.018380158 +0900
1965119691 +++ ../../git/progit2/progit2/book/A-git-in-other-environments/sections/visualstudio.asc 2020-07-13 09:35:20.947908596 +0900
1965219692 @@ -1,5 +1,6 @@
1965319693 === Git in Visual Studio
@@ -19684,7 +19724,7 @@ diff -au /tmp/book/A-git-in-other-environments/sections/visualstudio.asc.tmp ../
1968419724 +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[].
1968519725 Warning: file not found: ../../git/progit2/progit2-ja/book/A-git-in-other-environments/sections/visualstudiocode.asc
1968619726 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
19687---- /tmp/book/A-git-in-other-environments/sections/zsh.asc.tmp 2020-10-25 13:21:07.263959876 +0900
19727+--- /tmp/book/A-git-in-other-environments/sections/zsh.asc.tmp 2020-10-25 20:17:56.061380765 +0900
1968819728 +++ ../../git/progit2/progit2/book/A-git-in-other-environments/sections/zsh.asc 2020-07-04 16:36:46.743685694 +0900
1968919729 @@ -1,34 +1,55 @@
1969019730 === Git in Zsh
@@ -19757,7 +19797,7 @@ diff -au /tmp/book/B-embedding-git/sections/command-line.asc.tmp ../../git/progi
1975719797 Warning: file not found: ../../git/progit2/progit2-ja/book/B-embedding-git/sections/dulwich.asc
1975819798 Warning: file not found: ../../git/progit2/progit2-ja/book/B-embedding-git/sections/go-git.asc
1975919799 diff -au /tmp/book/B-embedding-git/sections/jgit.asc.tmp ../../git/progit2/progit2/book/B-embedding-git/sections/jgit.asc
19760---- /tmp/book/B-embedding-git/sections/jgit.asc.tmp 2020-10-25 13:21:07.280960781 +0900
19800+--- /tmp/book/B-embedding-git/sections/jgit.asc.tmp 2020-10-25 20:17:56.213382906 +0900
1976119801 +++ ../../git/progit2/progit2/book/B-embedding-git/sections/jgit.asc 2020-06-28 16:44:50.955019770 +0900
1976219802 @@ -1,21 +1,36 @@
1976319803 === JGit
@@ -19873,7 +19913,7 @@ diff -au /tmp/book/B-embedding-git/sections/jgit.asc.tmp ../../git/progit2/progi
1987319913 * The JGit Cookbook at https://github.com/centic9/jgit-cookbook[] has many examples of how to do specific tasks with JGit.
1987419914 -* There are several good resources pointed out at http://stackoverflow.com/questions/6861881[].
1987519915 diff -au /tmp/book/B-embedding-git/sections/libgit2.asc.tmp ../../git/progit2/progit2/book/B-embedding-git/sections/libgit2.asc
19876---- /tmp/book/B-embedding-git/sections/libgit2.asc.tmp 2020-10-25 13:21:07.291961366 +0900
19916+--- /tmp/book/B-embedding-git/sections/libgit2.asc.tmp 2020-10-25 20:17:56.269383696 +0900
1987719917 +++ ../../git/progit2/progit2/book/B-embedding-git/sections/libgit2.asc 2020-07-01 10:48:37.625009675 +0900
1987819918 @@ -1,13 +1,15 @@
1987919919 === Libgit2
@@ -20081,7 +20121,7 @@ diff -au /tmp/book/B-embedding-git/sections/libgit2.asc.tmp ../../git/progit2/pr
2008120121 pygit2.Repository("/path/to/repo") # open repository
2008220122 .head # get the current branch
2008320123 diff -au /tmp/book/contributors.asc.tmp ../../git/progit2/progit2/book/contributors.asc
20084---- /tmp/book/contributors.asc.tmp 2020-10-25 13:21:07.299961791 +0900
20124+--- /tmp/book/contributors.asc.tmp 2020-10-25 20:17:56.322384440 +0900
2008520125 +++ ../../git/progit2/progit2/book/contributors.asc 2020-06-28 16:44:50.955019770 +0900
2008620126 @@ -1,4 +1,12 @@
2008720127 [preface]
@@ -20098,7 +20138,7 @@ diff -au /tmp/book/contributors.asc.tmp ../../git/progit2/progit2/book/contribut
2009820138 +----
2009920139 +
2010020140 diff -au /tmp/book/dedication.asc.tmp ../../git/progit2/progit2/book/dedication.asc
20101---- /tmp/book/dedication.asc.tmp 2020-10-25 13:21:07.307962217 +0900
20141+--- /tmp/book/dedication.asc.tmp 2020-10-25 20:17:56.345384765 +0900
2010220142 +++ ../../git/progit2/progit2/book/dedication.asc 2020-06-28 16:44:50.960020506 +0900
2010320143 @@ -1,8 +1,8 @@
2010420144 -[preface]
@@ -20113,12 +20153,8 @@ diff -au /tmp/book/dedication.asc.tmp ../../git/progit2/progit2/book/dedication.
2011320153 +To my wife Jessica who has supported me for all of these years and to my daughter Josephine,
2011420154 who will support me when I'm too old to know what's going on. — Scott_
2011520155 diff -au /tmp/book/index.asc.tmp ../../git/progit2/progit2/book/index.asc
20116---- /tmp/book/index.asc.tmp 2020-10-25 13:21:07.317962749 +0900
20117-+++ ../../git/progit2/progit2/book/index.asc 2020-06-28 16:44:50.960020506 +0900
20118-@@ -0,0 +1 @@
20119-+== Index
2012020156 diff -au /tmp/book/introduction.asc.tmp ../../git/progit2/progit2/book/introduction.asc
20121---- /tmp/book/introduction.asc.tmp 2020-10-25 13:21:07.326963228 +0900
20157+--- /tmp/book/introduction.asc.tmp 2020-10-25 20:17:56.420385824 +0900
2012220158 +++ ../../git/progit2/progit2/book/introduction.asc 2020-06-28 16:44:50.960020506 +0900
2012320159 @@ -1,69 +1,58 @@
2012420160 [preface]
@@ -20243,15 +20279,16 @@ diff -au /tmp/book/introduction.asc.tmp ../../git/progit2/progit2/book/introduct
2024320279 -Let’s get started.
2024420280 +Let's get started.
2024520281 diff -au /tmp/book/license.asc.tmp ../../git/progit2/progit2/book/license.asc
20246---- /tmp/book/license.asc.tmp 2020-10-25 13:21:07.334963653 +0900
20282+--- /tmp/book/license.asc.tmp 2020-10-25 20:17:56.444386161 +0900
2024720283 +++ ../../git/progit2/progit2/book/license.asc 2020-06-28 16:44:50.961020654 +0900
20248-@@ -0,0 +1,4 @@
20249-+[preface]
20284+@@ -1,4 +1,4 @@
20285+ [preface]
20286+-== ライセンス
2025020287 +== Licence
20251-+
20252-+include::../LICENSE.asc[]
20288+
20289+ include::../LICENSE.asc[]
2025320290 diff -au /tmp/book/preface_ben.asc.tmp ../../git/progit2/progit2/book/preface_ben.asc
20254---- /tmp/book/preface_ben.asc.tmp 2020-10-25 13:21:07.341964025 +0900
20291+--- /tmp/book/preface_ben.asc.tmp 2020-10-25 20:17:56.461386401 +0900
2025520292 +++ ../../git/progit2/progit2/book/preface_ben.asc 2020-06-28 16:44:50.961020654 +0900
2025620293 @@ -1,8 +1,12 @@
2025720294 [preface]
@@ -20271,14 +20308,10 @@ diff -au /tmp/book/preface_ben.asc.tmp ../../git/progit2/progit2/book/preface_be
2027120308 +I hope it helps you as much as it did me.
2027220309 Warning: file not found: ../../git/progit2/progit2-ja/book/preface_schacon.asc
2027320310 diff -au /tmp/book/toc.asc.tmp ../../git/progit2/progit2/book/toc.asc
20274---- /tmp/book/toc.asc.tmp 2020-10-25 13:21:07.348964398 +0900
20275-+++ ../../git/progit2/progit2/book/toc.asc 2020-06-28 16:44:50.961020654 +0900
20276-@@ -0,0 +1 @@
20277-+{{ toc }}
2027820311 Warning: file not found: ../../git/progit2/progit2-ja/ch01-getting-started.asc
2027920312 Warning: file not found: ../../git/progit2/progit2-ja/ch02-git-basics-chapter.asc
2028020313 diff -au /tmp/ch03-git-branching.asc.tmp ../../git/progit2/progit2/ch03-git-branching.asc
20281---- /tmp/ch03-git-branching.asc.tmp 2020-10-25 13:21:07.357964876 +0900
20314+--- /tmp/ch03-git-branching.asc.tmp 2020-10-25 20:17:56.482386697 +0900
2028220315 +++ ../../git/progit2/progit2/ch03-git-branching.asc 2020-06-28 16:44:50.963020948 +0900
2028320316 @@ -1,7 +1,7 @@
2028420317 -[#ch03-git-branching]
@@ -20292,7 +20325,7 @@ diff -au /tmp/ch03-git-branching.asc.tmp ../../git/progit2/progit2/ch03-git-bran
2029220325 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.
2029320326 Warning: file not found: ../../git/progit2/progit2-ja/ch04-git-on-the-server.asc
2029420327 diff -au /tmp/ch05-distributed-git.asc.tmp ../../git/progit2/progit2/ch05-distributed-git.asc
20295---- /tmp/ch05-distributed-git.asc.tmp 2020-10-25 13:21:07.364965249 +0900
20328+--- /tmp/ch05-distributed-git.asc.tmp 2020-10-25 20:17:56.497386909 +0900
2029620329 +++ ../../git/progit2/progit2/ch05-distributed-git.asc 2020-06-28 16:44:50.963020948 +0900
2029720330 @@ -1,8 +1,8 @@
2029820331 -[#ch05-distributed-git]
@@ -20307,7 +20340,7 @@ diff -au /tmp/ch05-distributed-git.asc.tmp ../../git/progit2/progit2/ch05-distri
2030720340 In this chapter, you'll see how to work with Git in a distributed environment as a contributor and an integrator.
2030820341 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.
2030920342 diff -au /tmp/ch06-github.asc.tmp ../../git/progit2/progit2/ch06-github.asc
20310---- /tmp/ch06-github.asc.tmp 2020-10-25 13:21:07.374965781 +0900
20343+--- /tmp/ch06-github.asc.tmp 2020-10-25 20:17:56.513387134 +0900
2031120344 +++ ../../git/progit2/progit2/ch06-github.asc 2020-06-28 16:44:50.963020948 +0900
2031220345 @@ -1,5 +1,4 @@
2031320346 -[#ch06-github]
@@ -20333,7 +20366,7 @@ diff -au /tmp/ch06-github.asc.tmp ../../git/progit2/progit2/ch06-github.asc
2033320366
2033420367 include::book/06-github/sections/2-contributing.asc[]
2033520368 diff -au /tmp/ch07-git-tools.asc.tmp ../../git/progit2/progit2/ch07-git-tools.asc
20336---- /tmp/ch07-git-tools.asc.tmp 2020-10-25 13:21:07.380966100 +0900
20369+--- /tmp/ch07-git-tools.asc.tmp 2020-10-25 20:17:56.526387317 +0900
2033720370 +++ ../../git/progit2/progit2/ch07-git-tools.asc 2020-06-28 16:44:50.963020948 +0900
2033820371 @@ -1,11 +1,10 @@
2033920372 -[#ch07-git-tools]
@@ -20363,7 +20396,7 @@ diff -au /tmp/ch07-git-tools.asc.tmp ../../git/progit2/progit2/ch07-git-tools.as
2036320396 +If you want to use subprojects in your project, you've learned how to accommodate those needs.
2036420397 +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.
2036520398 diff -au /tmp/ch08-customizing-git.asc.tmp ../../git/progit2/progit2/ch08-customizing-git.asc
20366---- /tmp/ch08-customizing-git.asc.tmp 2020-10-25 13:21:07.390966632 +0900
20399+--- /tmp/ch08-customizing-git.asc.tmp 2020-10-25 20:17:56.537387472 +0900
2036720400 +++ ../../git/progit2/progit2/ch08-customizing-git.asc 2020-06-28 16:44:50.964021095 +0900
2036820401 @@ -1,5 +1,4 @@
2036920402 -[#ch08-customizing-git]
@@ -20374,7 +20407,7 @@ diff -au /tmp/ch08-customizing-git.asc.tmp ../../git/progit2/progit2/ch08-custom
2037420407 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.
2037520408 Warning: file not found: ../../git/progit2/progit2-ja/ch09-git-and-other-systems.asc
2037620409 diff -au /tmp/ch10-git-internals.asc.tmp ../../git/progit2/progit2/ch10-git-internals.asc
20377---- /tmp/ch10-git-internals.asc.tmp 2020-10-25 13:21:07.396966951 +0900
20410+--- /tmp/ch10-git-internals.asc.tmp 2020-10-25 20:17:56.545387585 +0900
2037820411 +++ ../../git/progit2/progit2/ch10-git-internals.asc 2020-06-28 16:44:50.964021095 +0900
2037920412 @@ -1,9 +1,8 @@
2038020413 -[#ch10-git-internals]
@@ -20412,65 +20445,64 @@ diff -au /tmp/ch10-git-internals.asc.tmp ../../git/progit2/progit2/ch10-git-inte
2041220445 Git as a content-addressable filesystem is a very powerful tool that you can easily use as more than just a VCS.
2041320446 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.
2041420447 diff -au /tmp/index.asc.tmp ../../git/progit2/progit2/index.asc
20415---- /tmp/index.asc.tmp 2020-10-25 13:21:07.403967323 +0900
20416-+++ ../../git/progit2/progit2/index.asc 2020-06-28 16:44:51.438090759 +0900
20417-@@ -0,0 +1,3 @@
20418-+[#index]
20419-+[index]
20420-+= Index
2042120448 diff -au /tmp/progit.asc.tmp ../../git/progit2/progit2/progit.asc
20422---- /tmp/progit.asc.tmp 2020-10-25 13:21:07.411967749 +0900
20449+--- /tmp/progit.asc.tmp 2020-10-25 20:17:56.639388909 +0900
2042320450 +++ ../../git/progit2/progit2/progit.asc 2020-06-28 16:44:51.438090759 +0900
20424-@@ -0,0 +1,52 @@
20425-+Pro Git
20426-+=======
20451+@@ -1,34 +1,35 @@
20452+ Pro Git
20453+ =======
2042720454 +Scott Chacon; Ben Straub
20428-+:doctype: book
20429-+:docinfo:
20430-+:toc:
20431-+:toclevels: 2
20432-+:pagenums:
20433-+:front-cover-image: image:book/cover.png[width=1050,height=1600]
20455+ :doctype: book
20456+ :docinfo:
20457+ :toc:
20458+ :toclevels: 2
20459+ :pagenums:
20460+ :front-cover-image: image:book/cover.png[width=1050,height=1600]
20461+-:toc-title: 目次
2043420462 +:icons: font
20435-+
20436-+ifdef::ebook-format[:leveloffset: -1]
20437-+
20438-+include::book/license.asc[]
20439-+
20463+
20464+ ifdef::ebook-format[:leveloffset: -1]
20465+
20466+ include::book/license.asc[]
20467+
20468+-include::book/preface_scott.asc[]
2044020469 +include::book/preface_schacon.asc[]
20441-+
20442-+include::book/preface_ben.asc[]
20443-+
20444-+include::book/dedication.asc[]
20445-+
20470+
20471+ include::book/preface_ben.asc[]
20472+
20473+ include::book/dedication.asc[]
20474+
20475+-//include::book/contributors.asc[]
2044620476 +include::book/contributors.asc[]
20447-+
20448-+include::book/introduction.asc[]
20449-+
20477+
20478+ include::book/introduction.asc[]
20479+
20480+-include::ch01-introduction.asc[]
2045020481 +include::ch01-getting-started.asc[]
20451-+
20482+
20483+-include::ch02-git-basics.asc[]
2045220484 +include::ch02-git-basics-chapter.asc[]
20453-+
20454-+include::ch03-git-branching.asc[]
20455-+
20485+
20486+ include::ch03-git-branching.asc[]
20487+
20488+-include::ch04-git-server.asc[]
2045620489 +include::ch04-git-on-the-server.asc[]
20457-+
20458-+include::ch05-distributed-git.asc[]
20459-+
20460-+include::ch06-github.asc[]
20461-+
20462-+include::ch07-git-tools.asc[]
20463-+
20464-+include::ch08-customizing-git.asc[]
20465-+
20490+
20491+ include::ch05-distributed-git.asc[]
20492+
20493+@@ -38,13 +39,13 @@
20494+
20495+ include::ch08-customizing-git.asc[]
20496+
20497+-include::ch09-git-and-other-scms.asc[]
2046620498 +include::ch09-git-and-other-systems.asc[]
20467-+
20468-+include::ch10-git-internals.asc[]
20469-+
20470-+include::A-git-in-other-environments.asc[]
20471-+
20499+
20500+ include::ch10-git-internals.asc[]
20501+
20502+ include::A-git-in-other-environments.asc[]
20503+
20504+-include::B-embedding-git.asc[]
2047220505 +include::B-embedding-git-in-your-applications.asc[]
20473-+
20474-+include::C-git-commands.asc[]
20475-+
20476-+ifndef::ebook-format[include::index.asc[]]
20506+
20507+ include::C-git-commands.asc[]
20508+
--- a/progit2ja_diff/progit2ja_diff.perl
+++ b/progit2ja_diff/progit2ja_diff.perl
@@ -5,13 +5,13 @@
55 ### 利用方法
66 ### ./progit2ja_diff.perl <origdir> <jadir> [<target>]
77 ###
8-### <origdir>: progit2 オリジナルのソーストップディレクトリ名
9-### <jadir>: progit/progit2-ja のソーストップディレクトリ名
8+### <origdir>: progit2 オリジナルのソーストップディレクトリパス
9+### <jadir>: progit/progit2-ja のソーストップディレクトリパス
1010 ### <target>: (任意)処理対象とするascファイルのベース名。
1111 ### この指定がない場合は全ファイルを対象とする。
1212 ###
1313 ### progit/progit2-ja のソース内にコメントとして示された原文部分を
14-### progit オリジナル全ソースと比較して、diff を取り標準出力します。
14+### progit オリジナルソースと比較して diff を取り、標準出力します。
1515 ###
1616 ### 処理方法はざっと以下です。<origdir> 配下の *.asc ファイルを順に
1717 ### 処理します。そのベース名に応じた <jadir> 配下の *.asc ファイル
@@ -128,6 +128,9 @@ sub output_ja_tempfile {
128128 $lines = $lines . $line;
129129 }
130130 }
131+ if ($lines ne "") {
132+ &output_tempfile;
133+ }
131134 close($fh_jasrc);
132135 close($fh_tempfile);
133136 }