From d2152ec39f6ba471bdbe486ef7bafa2511e7f818 Mon Sep 17 00:00:00 2001 From: Adrien Ollier Date: Mon, 28 Aug 2017 08:21:45 +0200 Subject: [PATCH] New architecture of the repository for manual building of the book. The old architecture was needed for the building of the book by Atlas. Atlas O'Reilly's building chain (https://atlas.oreilly.com) is broken. --- .gitignore | 1 - README.asc | 9 +-------- Rakefile | 10 +--------- {book/06-github/images => images}/2fa-1.png | Bin .../images => images}/account-settings.png | Bin .../images => images}/advance-master.png | Bin .../images => images}/advance-testing.png | Bin {book/01-introduction/images => images}/areas.png | Bin {book/06-github/images => images}/avatar-crop.png | Bin .../images => images}/basic-branching-1.png | Bin .../images => images}/basic-branching-2.png | Bin .../images => images}/basic-branching-3.png | Bin .../images => images}/basic-branching-4.png | Bin .../images => images}/basic-branching-5.png | Bin .../images => images}/basic-branching-6.png | Bin .../images => images}/basic-merging-1.png | Bin .../images => images}/basic-merging-2.png | Bin .../images => images}/basic-rebase-1.png | Bin .../images => images}/basic-rebase-2.png | Bin .../images => images}/basic-rebase-3.png | Bin .../images => images}/basic-rebase-4.png | Bin .../images => images}/benevolent-dictator.png | Bin {book/04-git-server/images => images}/bitnami.png | Bin .../06-github/images => images}/blink-01-start.png | Bin {book/06-github/images => images}/blink-02-pr.png | Bin .../blink-03-pull-request-open.png | Bin .../06-github/images => images}/blink-04-email.png | Bin .../images => images}/blink-04-pr-comment.png | Bin .../images => images}/blink-05-general-comment.png | Bin .../06-github/images => images}/blink-06-final.png | Bin .../images => images}/branch-and-history.png | Bin .../images => images}/branch_widget_mac.png | Bin .../images => images}/branch_widget_win.png | Bin .../images => images}/centralized.png | Bin .../images => images}/centralized_workflow.png | Bin .../images => images}/checkout-master.png | Bin .../08-customizing-git/images => images}/clean.png | Bin {book/06-github/images => images}/collaborators.png | Bin .../images => images}/commit-and-tree.png | Bin .../images => images}/commits-and-parents.png | Bin .../images => images}/data-model-1.png | Bin .../images => images}/data-model-2.png | Bin .../images => images}/data-model-3.png | Bin .../images => images}/data-model-4.png | Bin {book/01-introduction/images => images}/deltas.png | Bin .../images => images}/distributed.png | Bin {book/07-git-tools/images => images}/double-dot.png | Bin .../images => images}/egit.png | Bin .../06-github/images => images}/email-settings.png | Bin {book/06-github/images => images}/emoji.png | Bin {book/06-github/images => images}/forkbutton.png | Bin .../images => images}/git-bash.png | Bin .../images => images}/git-diff-check.png | Bin .../images => images}/git-fusion-boot.png | Bin .../images => images}/git-fusion-perforce-graph.png | Bin .../images => images}/git-gui.png | Bin .../images => images}/git-instaweb.png | Bin .../images => images}/git-osx-installer.png | Bin .../images => images}/git-tfs-ct.png | Bin .../images => images}/github_mac.png | Bin .../images => images}/github_win.png | Bin .../images => images}/gitk.png | Bin .../images => images}/gitlab-groups.png | Bin .../04-git-server/images => images}/gitlab-menu.png | Bin .../images => images}/gitlab-users.png | Bin .../images => images}/head-to-master.png | Bin .../images => images}/head-to-testing.png | Bin .../images => images}/integration-manager.png | Bin .../images => images}/interesting-rebase-1.png | Bin .../images => images}/interesting-rebase-2.png | Bin .../images => images}/interesting-rebase-3.png | Bin .../images => images}/interesting-rebase-4.png | Bin .../images => images}/interesting-rebase-5.png | Bin .../images => images}/large-merges-1.png | Bin .../images => images}/large-merges-2.png | Bin {book/02-git-basics/images => images}/lifecycle.png | Bin {book/01-introduction/images => images}/local.png | Bin .../images => images}/lr-branches-1.png | Bin .../images => images}/lr-branches-2.png | Bin .../06-github/images => images}/maint-01-email.png | Bin .../06-github/images => images}/maint-02-merge.png | Bin .../images => images}/maint-03-email-resp.png | Bin .../06-github/images => images}/maint-04-target.png | Bin .../images => images}/maint-05-mentions.png | Bin .../images => images}/maint-06-unsubscribe.png | Bin .../images => images}/maint-07-notifications.png | Bin .../maint-08-notifications-page.png | Bin .../images => images}/maint-09-contrib.png | Bin .../images => images}/maint-10-default-branch.png | Bin .../images => images}/maint-11-transfer.png | Bin .../images => images}/managed-team-1.png | Bin .../images => images}/managed-team-2.png | Bin .../images => images}/managed-team-3.png | Bin .../images => images}/managed-team-flow.png | Bin .../images => images}/markdown-01-example.png | Bin .../images => images}/markdown-02-tasks.png | Bin .../images => images}/markdown-03-task-summary.png | Bin .../images => images}/markdown-04-fenced-code.png | Bin .../images => images}/markdown-05-quote.png | Bin .../markdown-06-emoji-complete.png | Bin .../images => images}/markdown-07-emoji.png | Bin .../images => images}/markdown-08-drag-drop.png | Bin .../images => images}/mentions-01-syntax.png | Bin .../images => images}/mentions-02-render.png | Bin .../images => images}/mentions-03-closed.png | Bin .../images => images}/merging-workflows-1.png | Bin .../images => images}/merging-workflows-2.png | Bin .../images => images}/merging-workflows-3.png | Bin .../images => images}/merging-workflows-4.png | Bin .../images => images}/merging-workflows-5.png | Bin {book/06-github/images => images}/new-repo.png | Bin {book/06-github/images => images}/neworg.png | Bin {book/06-github/images => images}/newrepo.png | Bin {book/06-github/images => images}/newrepoform.png | Bin {book/06-github/images => images}/notifications.png | Bin {book/06-github/images => images}/orgs-01-page.png | Bin {book/06-github/images => images}/orgs-02-teams.png | Bin {book/06-github/images => images}/orgs-03-audit.png | Bin .../images => images}/p4merge.png | Bin .../images => images}/perils-of-rebasing-1.png | Bin .../images => images}/perils-of-rebasing-2.png | Bin .../images => images}/perils-of-rebasing-3.png | Bin .../images => images}/perils-of-rebasing-4.png | Bin .../images => images}/perils-of-rebasing-5.png | Bin .../images => images}/posh-git.png | Bin {book/06-github/images => images}/pr-01-fail.png | Bin .../06-github/images => images}/pr-02-merge-fix.png | Bin .../images => images}/public-small-1.png | Bin .../images => images}/public-small-2.png | Bin .../images => images}/public-small-3.png | Bin .../images => images}/rebasing-1.png | Bin .../images => images}/rebasing-2.png | Bin .../images => images}/remote-branches-1.png | Bin .../images => images}/remote-branches-2.png | Bin .../images => images}/remote-branches-3.png | Bin .../images => images}/remote-branches-4.png | Bin .../images => images}/remote-branches-5.png | Bin {book/07-git-tools/images => images}/replace1.png | Bin {book/07-git-tools/images => images}/replace2.png | Bin {book/07-git-tools/images => images}/replace3.png | Bin {book/07-git-tools/images => images}/replace4.png | Bin {book/07-git-tools/images => images}/replace5.png | Bin .../images => images}/reposettingslink.png | Bin {book/07-git-tools/images => images}/rerere1.png | Bin {book/07-git-tools/images => images}/rerere2.png | Bin {book/07-git-tools/images => images}/rerere3.png | Bin .../images => images}/reset-checkout.png | Bin {book/07-git-tools/images => images}/reset-ex1.png | Bin {book/07-git-tools/images => images}/reset-ex2.png | Bin {book/07-git-tools/images => images}/reset-ex3.png | Bin {book/07-git-tools/images => images}/reset-ex4.png | Bin {book/07-git-tools/images => images}/reset-ex5.png | Bin {book/07-git-tools/images => images}/reset-ex6.png | Bin {book/07-git-tools/images => images}/reset-hard.png | Bin .../07-git-tools/images => images}/reset-mixed.png | Bin .../07-git-tools/images => images}/reset-path1.png | Bin .../07-git-tools/images => images}/reset-path2.png | Bin .../07-git-tools/images => images}/reset-path3.png | Bin {book/07-git-tools/images => images}/reset-soft.png | Bin .../images => images}/reset-squash-r1.png | Bin .../images => images}/reset-squash-r2.png | Bin .../images => images}/reset-squash-r3.png | Bin .../07-git-tools/images => images}/reset-start.png | Bin .../images => images}/reset-workflow.png | Bin .../images => images}/scripting-01-services.png | Bin .../scripting-02-email-service.png | Bin .../images => images}/scripting-03-webhook.png | Bin .../scripting-04-webhook-debug.png | Bin .../images => images}/scripting-05-access-token.png | Bin .../images => images}/scripting-06-comment.png | Bin .../images => images}/scripting-07-status.png | Bin {book/06-github/images => images}/signup.png | Bin .../images => images}/small-team-1.png | Bin .../images => images}/small-team-2.png | Bin .../images => images}/small-team-3.png | Bin .../images => images}/small-team-4.png | Bin .../images => images}/small-team-5.png | Bin .../images => images}/small-team-6.png | Bin .../images => images}/small-team-7.png | Bin .../images => images}/small-team-flow.png | Bin .../08-customizing-git/images => images}/smudge.png | Bin .../01-introduction/images => images}/snapshots.png | Bin {book/06-github/images => images}/ssh-keys.png | Bin .../images => images}/topic-branches-1.png | Bin .../images => images}/topic-branches-2.png | Bin .../images => images}/two-branches.png | Bin .../images => images}/undomerge-reset.png | Bin .../images => images}/undomerge-revert.png | Bin .../images => images}/undomerge-revert2.png | Bin .../images => images}/undomerge-revert3.png | Bin .../images => images}/undomerge-start.png | Bin .../images => images}/vs-1.png | Bin .../images => images}/vs-2.png | Bin {book/06-github/images => images}/your-profile.png | Bin .../images => images}/zsh-oh-my.png | Bin .../images => images}/zsh-prompt.png | Bin 196 files changed, 2 insertions(+), 18 deletions(-) rename {book/06-github/images => images}/2fa-1.png (100%) rename {book/06-github/images => images}/account-settings.png (100%) rename {book/03-git-branching/images => images}/advance-master.png (100%) rename {book/03-git-branching/images => images}/advance-testing.png (100%) rename {book/01-introduction/images => images}/areas.png (100%) rename {book/06-github/images => images}/avatar-crop.png (100%) rename {book/03-git-branching/images => images}/basic-branching-1.png (100%) rename {book/03-git-branching/images => images}/basic-branching-2.png (100%) rename {book/03-git-branching/images => images}/basic-branching-3.png (100%) rename {book/03-git-branching/images => images}/basic-branching-4.png (100%) rename {book/03-git-branching/images => images}/basic-branching-5.png (100%) rename {book/03-git-branching/images => images}/basic-branching-6.png (100%) rename {book/03-git-branching/images => images}/basic-merging-1.png (100%) rename {book/03-git-branching/images => images}/basic-merging-2.png (100%) rename {book/03-git-branching/images => images}/basic-rebase-1.png (100%) rename {book/03-git-branching/images => images}/basic-rebase-2.png (100%) rename {book/03-git-branching/images => images}/basic-rebase-3.png (100%) rename {book/03-git-branching/images => images}/basic-rebase-4.png (100%) rename {book/05-distributed-git/images => images}/benevolent-dictator.png (100%) rename {book/04-git-server/images => images}/bitnami.png (100%) rename {book/06-github/images => images}/blink-01-start.png (100%) rename {book/06-github/images => images}/blink-02-pr.png (100%) rename {book/06-github/images => images}/blink-03-pull-request-open.png (100%) rename {book/06-github/images => images}/blink-04-email.png (100%) rename {book/06-github/images => images}/blink-04-pr-comment.png (100%) rename {book/06-github/images => images}/blink-05-general-comment.png (100%) rename {book/06-github/images => images}/blink-06-final.png (100%) rename {book/03-git-branching/images => images}/branch-and-history.png (100%) rename {book/A-git-in-other-environments/images => images}/branch_widget_mac.png (100%) rename {book/A-git-in-other-environments/images => images}/branch_widget_win.png (100%) rename {book/01-introduction/images => images}/centralized.png (100%) rename {book/05-distributed-git/images => images}/centralized_workflow.png (100%) rename {book/03-git-branching/images => images}/checkout-master.png (100%) rename {book/08-customizing-git/images => images}/clean.png (100%) rename {book/06-github/images => images}/collaborators.png (100%) rename {book/03-git-branching/images => images}/commit-and-tree.png (100%) rename {book/03-git-branching/images => images}/commits-and-parents.png (100%) rename {book/10-git-internals/images => images}/data-model-1.png (100%) rename {book/10-git-internals/images => images}/data-model-2.png (100%) rename {book/10-git-internals/images => images}/data-model-3.png (100%) rename {book/10-git-internals/images => images}/data-model-4.png (100%) rename {book/01-introduction/images => images}/deltas.png (100%) rename {book/01-introduction/images => images}/distributed.png (100%) rename {book/07-git-tools/images => images}/double-dot.png (100%) rename {book/A-git-in-other-environments/images => images}/egit.png (100%) rename {book/06-github/images => images}/email-settings.png (100%) rename {book/06-github/images => images}/emoji.png (100%) rename {book/06-github/images => images}/forkbutton.png (100%) rename {book/A-git-in-other-environments/images => images}/git-bash.png (100%) rename {book/05-distributed-git/images => images}/git-diff-check.png (100%) rename {book/09-git-and-other-scms/images => images}/git-fusion-boot.png (100%) rename {book/09-git-and-other-scms/images => images}/git-fusion-perforce-graph.png (100%) rename {book/A-git-in-other-environments/images => images}/git-gui.png (100%) rename {book/04-git-server/images => images}/git-instaweb.png (100%) rename {book/01-introduction/images => images}/git-osx-installer.png (100%) rename {book/09-git-and-other-scms/images => images}/git-tfs-ct.png (100%) rename {book/A-git-in-other-environments/images => images}/github_mac.png (100%) rename {book/A-git-in-other-environments/images => images}/github_win.png (100%) rename {book/A-git-in-other-environments/images => images}/gitk.png (100%) rename {book/04-git-server/images => images}/gitlab-groups.png (100%) rename {book/04-git-server/images => images}/gitlab-menu.png (100%) rename {book/04-git-server/images => images}/gitlab-users.png (100%) rename {book/03-git-branching/images => images}/head-to-master.png (100%) rename {book/03-git-branching/images => images}/head-to-testing.png (100%) rename {book/05-distributed-git/images => images}/integration-manager.png (100%) rename {book/03-git-branching/images => images}/interesting-rebase-1.png (100%) rename {book/03-git-branching/images => images}/interesting-rebase-2.png (100%) rename {book/03-git-branching/images => images}/interesting-rebase-3.png (100%) rename {book/03-git-branching/images => images}/interesting-rebase-4.png (100%) rename {book/03-git-branching/images => images}/interesting-rebase-5.png (100%) rename {book/05-distributed-git/images => images}/large-merges-1.png (100%) rename {book/05-distributed-git/images => images}/large-merges-2.png (100%) rename {book/02-git-basics/images => images}/lifecycle.png (100%) rename {book/01-introduction/images => images}/local.png (100%) rename {book/03-git-branching/images => images}/lr-branches-1.png (100%) rename {book/03-git-branching/images => images}/lr-branches-2.png (100%) rename {book/06-github/images => images}/maint-01-email.png (100%) rename {book/06-github/images => images}/maint-02-merge.png (100%) rename {book/06-github/images => images}/maint-03-email-resp.png (100%) rename {book/06-github/images => images}/maint-04-target.png (100%) rename {book/06-github/images => images}/maint-05-mentions.png (100%) rename {book/06-github/images => images}/maint-06-unsubscribe.png (100%) rename {book/06-github/images => images}/maint-07-notifications.png (100%) rename {book/06-github/images => images}/maint-08-notifications-page.png (100%) rename {book/06-github/images => images}/maint-09-contrib.png (100%) rename {book/06-github/images => images}/maint-10-default-branch.png (100%) rename {book/06-github/images => images}/maint-11-transfer.png (100%) rename {book/05-distributed-git/images => images}/managed-team-1.png (100%) rename {book/05-distributed-git/images => images}/managed-team-2.png (100%) rename {book/05-distributed-git/images => images}/managed-team-3.png (100%) rename {book/05-distributed-git/images => images}/managed-team-flow.png (100%) rename {book/06-github/images => images}/markdown-01-example.png (100%) rename {book/06-github/images => images}/markdown-02-tasks.png (100%) rename {book/06-github/images => images}/markdown-03-task-summary.png (100%) rename {book/06-github/images => images}/markdown-04-fenced-code.png (100%) rename {book/06-github/images => images}/markdown-05-quote.png (100%) rename {book/06-github/images => images}/markdown-06-emoji-complete.png (100%) rename {book/06-github/images => images}/markdown-07-emoji.png (100%) rename {book/06-github/images => images}/markdown-08-drag-drop.png (100%) rename {book/06-github/images => images}/mentions-01-syntax.png (100%) rename {book/06-github/images => images}/mentions-02-render.png (100%) rename {book/06-github/images => images}/mentions-03-closed.png (100%) rename {book/05-distributed-git/images => images}/merging-workflows-1.png (100%) rename {book/05-distributed-git/images => images}/merging-workflows-2.png (100%) rename {book/05-distributed-git/images => images}/merging-workflows-3.png (100%) rename {book/05-distributed-git/images => images}/merging-workflows-4.png (100%) rename {book/05-distributed-git/images => images}/merging-workflows-5.png (100%) rename {book/06-github/images => images}/new-repo.png (100%) rename {book/06-github/images => images}/neworg.png (100%) rename {book/06-github/images => images}/newrepo.png (100%) rename {book/06-github/images => images}/newrepoform.png (100%) rename {book/06-github/images => images}/notifications.png (100%) rename {book/06-github/images => images}/orgs-01-page.png (100%) rename {book/06-github/images => images}/orgs-02-teams.png (100%) rename {book/06-github/images => images}/orgs-03-audit.png (100%) rename {book/08-customizing-git/images => images}/p4merge.png (100%) rename {book/03-git-branching/images => images}/perils-of-rebasing-1.png (100%) rename {book/03-git-branching/images => images}/perils-of-rebasing-2.png (100%) rename {book/03-git-branching/images => images}/perils-of-rebasing-3.png (100%) rename {book/03-git-branching/images => images}/perils-of-rebasing-4.png (100%) rename {book/03-git-branching/images => images}/perils-of-rebasing-5.png (100%) rename {book/A-git-in-other-environments/images => images}/posh-git.png (100%) rename {book/06-github/images => images}/pr-01-fail.png (100%) rename {book/06-github/images => images}/pr-02-merge-fix.png (100%) rename {book/05-distributed-git/images => images}/public-small-1.png (100%) rename {book/05-distributed-git/images => images}/public-small-2.png (100%) rename {book/05-distributed-git/images => images}/public-small-3.png (100%) rename {book/05-distributed-git/images => images}/rebasing-1.png (100%) rename {book/05-distributed-git/images => images}/rebasing-2.png (100%) rename {book/03-git-branching/images => images}/remote-branches-1.png (100%) rename {book/03-git-branching/images => images}/remote-branches-2.png (100%) rename {book/03-git-branching/images => images}/remote-branches-3.png (100%) rename {book/03-git-branching/images => images}/remote-branches-4.png (100%) rename {book/03-git-branching/images => images}/remote-branches-5.png (100%) rename {book/07-git-tools/images => images}/replace1.png (100%) rename {book/07-git-tools/images => images}/replace2.png (100%) rename {book/07-git-tools/images => images}/replace3.png (100%) rename {book/07-git-tools/images => images}/replace4.png (100%) rename {book/07-git-tools/images => images}/replace5.png (100%) rename {book/06-github/images => images}/reposettingslink.png (100%) rename {book/07-git-tools/images => images}/rerere1.png (100%) rename {book/07-git-tools/images => images}/rerere2.png (100%) rename {book/07-git-tools/images => images}/rerere3.png (100%) rename {book/07-git-tools/images => images}/reset-checkout.png (100%) rename {book/07-git-tools/images => images}/reset-ex1.png (100%) rename {book/07-git-tools/images => images}/reset-ex2.png (100%) rename {book/07-git-tools/images => images}/reset-ex3.png (100%) rename {book/07-git-tools/images => images}/reset-ex4.png (100%) rename {book/07-git-tools/images => images}/reset-ex5.png (100%) rename {book/07-git-tools/images => images}/reset-ex6.png (100%) rename {book/07-git-tools/images => images}/reset-hard.png (100%) rename {book/07-git-tools/images => images}/reset-mixed.png (100%) rename {book/07-git-tools/images => images}/reset-path1.png (100%) rename {book/07-git-tools/images => images}/reset-path2.png (100%) rename {book/07-git-tools/images => images}/reset-path3.png (100%) rename {book/07-git-tools/images => images}/reset-soft.png (100%) rename {book/07-git-tools/images => images}/reset-squash-r1.png (100%) rename {book/07-git-tools/images => images}/reset-squash-r2.png (100%) rename {book/07-git-tools/images => images}/reset-squash-r3.png (100%) rename {book/07-git-tools/images => images}/reset-start.png (100%) rename {book/07-git-tools/images => images}/reset-workflow.png (100%) rename {book/06-github/images => images}/scripting-01-services.png (100%) rename {book/06-github/images => images}/scripting-02-email-service.png (100%) rename {book/06-github/images => images}/scripting-03-webhook.png (100%) rename {book/06-github/images => images}/scripting-04-webhook-debug.png (100%) rename {book/06-github/images => images}/scripting-05-access-token.png (100%) rename {book/06-github/images => images}/scripting-06-comment.png (100%) rename {book/06-github/images => images}/scripting-07-status.png (100%) rename {book/06-github/images => images}/signup.png (100%) rename {book/05-distributed-git/images => images}/small-team-1.png (100%) rename {book/05-distributed-git/images => images}/small-team-2.png (100%) rename {book/05-distributed-git/images => images}/small-team-3.png (100%) rename {book/05-distributed-git/images => images}/small-team-4.png (100%) rename {book/05-distributed-git/images => images}/small-team-5.png (100%) rename {book/05-distributed-git/images => images}/small-team-6.png (100%) rename {book/05-distributed-git/images => images}/small-team-7.png (100%) rename {book/05-distributed-git/images => images}/small-team-flow.png (100%) rename {book/08-customizing-git/images => images}/smudge.png (100%) rename {book/01-introduction/images => images}/snapshots.png (100%) rename {book/06-github/images => images}/ssh-keys.png (100%) rename {book/03-git-branching/images => images}/topic-branches-1.png (100%) rename {book/03-git-branching/images => images}/topic-branches-2.png (100%) rename {book/03-git-branching/images => images}/two-branches.png (100%) rename {book/07-git-tools/images => images}/undomerge-reset.png (100%) rename {book/07-git-tools/images => images}/undomerge-revert.png (100%) rename {book/07-git-tools/images => images}/undomerge-revert2.png (100%) rename {book/07-git-tools/images => images}/undomerge-revert3.png (100%) rename {book/07-git-tools/images => images}/undomerge-start.png (100%) rename {book/A-git-in-other-environments/images => images}/vs-1.png (100%) rename {book/A-git-in-other-environments/images => images}/vs-2.png (100%) rename {book/06-github/images => images}/your-profile.png (100%) rename {book/A-git-in-other-environments/images => images}/zsh-oh-my.png (100%) rename {book/A-git-in-other-environments/images => images}/zsh-prompt.png (100%) diff --git a/.gitignore b/.gitignore index 853851878..e00a9543c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ progit.pdfmarks progit.epub progit-kf8.epub progit.mobi -/images/ diff --git a/README.asc b/README.asc index e928ac75e..d7810fd83 100644 --- a/README.asc +++ b/README.asc @@ -31,18 +31,11 @@ Converting to PDF... ---- An alternative to calling the `bundle` command is to call directly the `asciidoctor` command. -If it is the first time you're building the book, it is necessary to create the _images_ folder and fill it. -Do the following only once: ----- -$ mkdir images/ -$ cp book/*/images/* images/ ----- - -Then you can build the book. Use the following commands: ---- +$ asciidoctor progit.asc $ asciidoctor-pdf progit.asc $ asciidoctor-epub3 progit.asc $ asciidoctor-epub3 -a ebook-format=kf8 progit.asc diff --git a/Rakefile b/Rakefile index 4f42af69f..41d0cd501 100644 --- a/Rakefile +++ b/Rakefile @@ -1,14 +1,6 @@ namespace :book do - desc 'prepare build' - task :prebuild do - Dir.mkdir 'images' unless Dir.exists? 'images' - Dir.glob("book/*/images/*").each do |image| - FileUtils.copy(image, "images/" + File.basename(image)) - end - end - desc 'build basic book formats' - task :build => :prebuild do + task :build do puts "Converting to HTML..." `bundle exec asciidoctor progit.asc` puts " -- HTML output at progit.html" diff --git a/book/06-github/images/2fa-1.png b/images/2fa-1.png similarity index 100% rename from book/06-github/images/2fa-1.png rename to images/2fa-1.png diff --git a/book/06-github/images/account-settings.png b/images/account-settings.png similarity index 100% rename from book/06-github/images/account-settings.png rename to images/account-settings.png diff --git a/book/03-git-branching/images/advance-master.png b/images/advance-master.png similarity index 100% rename from book/03-git-branching/images/advance-master.png rename to images/advance-master.png diff --git a/book/03-git-branching/images/advance-testing.png b/images/advance-testing.png similarity index 100% rename from book/03-git-branching/images/advance-testing.png rename to images/advance-testing.png diff --git a/book/01-introduction/images/areas.png b/images/areas.png similarity index 100% rename from book/01-introduction/images/areas.png rename to images/areas.png diff --git a/book/06-github/images/avatar-crop.png b/images/avatar-crop.png similarity index 100% rename from book/06-github/images/avatar-crop.png rename to images/avatar-crop.png diff --git a/book/03-git-branching/images/basic-branching-1.png b/images/basic-branching-1.png similarity index 100% rename from book/03-git-branching/images/basic-branching-1.png rename to images/basic-branching-1.png diff --git a/book/03-git-branching/images/basic-branching-2.png b/images/basic-branching-2.png similarity index 100% rename from book/03-git-branching/images/basic-branching-2.png rename to images/basic-branching-2.png diff --git a/book/03-git-branching/images/basic-branching-3.png b/images/basic-branching-3.png similarity index 100% rename from book/03-git-branching/images/basic-branching-3.png rename to images/basic-branching-3.png diff --git a/book/03-git-branching/images/basic-branching-4.png b/images/basic-branching-4.png similarity index 100% rename from book/03-git-branching/images/basic-branching-4.png rename to images/basic-branching-4.png diff --git a/book/03-git-branching/images/basic-branching-5.png b/images/basic-branching-5.png similarity index 100% rename from book/03-git-branching/images/basic-branching-5.png rename to images/basic-branching-5.png diff --git a/book/03-git-branching/images/basic-branching-6.png b/images/basic-branching-6.png similarity index 100% rename from book/03-git-branching/images/basic-branching-6.png rename to images/basic-branching-6.png diff --git a/book/03-git-branching/images/basic-merging-1.png b/images/basic-merging-1.png similarity index 100% rename from book/03-git-branching/images/basic-merging-1.png rename to images/basic-merging-1.png diff --git a/book/03-git-branching/images/basic-merging-2.png b/images/basic-merging-2.png similarity index 100% rename from book/03-git-branching/images/basic-merging-2.png rename to images/basic-merging-2.png diff --git a/book/03-git-branching/images/basic-rebase-1.png b/images/basic-rebase-1.png similarity index 100% rename from book/03-git-branching/images/basic-rebase-1.png rename to images/basic-rebase-1.png diff --git a/book/03-git-branching/images/basic-rebase-2.png b/images/basic-rebase-2.png similarity index 100% rename from book/03-git-branching/images/basic-rebase-2.png rename to images/basic-rebase-2.png diff --git a/book/03-git-branching/images/basic-rebase-3.png b/images/basic-rebase-3.png similarity index 100% rename from book/03-git-branching/images/basic-rebase-3.png rename to images/basic-rebase-3.png diff --git a/book/03-git-branching/images/basic-rebase-4.png b/images/basic-rebase-4.png similarity index 100% rename from book/03-git-branching/images/basic-rebase-4.png rename to images/basic-rebase-4.png diff --git a/book/05-distributed-git/images/benevolent-dictator.png b/images/benevolent-dictator.png similarity index 100% rename from book/05-distributed-git/images/benevolent-dictator.png rename to images/benevolent-dictator.png diff --git a/book/04-git-server/images/bitnami.png b/images/bitnami.png similarity index 100% rename from book/04-git-server/images/bitnami.png rename to images/bitnami.png diff --git a/book/06-github/images/blink-01-start.png b/images/blink-01-start.png similarity index 100% rename from book/06-github/images/blink-01-start.png rename to images/blink-01-start.png diff --git a/book/06-github/images/blink-02-pr.png b/images/blink-02-pr.png similarity index 100% rename from book/06-github/images/blink-02-pr.png rename to images/blink-02-pr.png diff --git a/book/06-github/images/blink-03-pull-request-open.png b/images/blink-03-pull-request-open.png similarity index 100% rename from book/06-github/images/blink-03-pull-request-open.png rename to images/blink-03-pull-request-open.png diff --git a/book/06-github/images/blink-04-email.png b/images/blink-04-email.png similarity index 100% rename from book/06-github/images/blink-04-email.png rename to images/blink-04-email.png diff --git a/book/06-github/images/blink-04-pr-comment.png b/images/blink-04-pr-comment.png similarity index 100% rename from book/06-github/images/blink-04-pr-comment.png rename to images/blink-04-pr-comment.png diff --git a/book/06-github/images/blink-05-general-comment.png b/images/blink-05-general-comment.png similarity index 100% rename from book/06-github/images/blink-05-general-comment.png rename to images/blink-05-general-comment.png diff --git a/book/06-github/images/blink-06-final.png b/images/blink-06-final.png similarity index 100% rename from book/06-github/images/blink-06-final.png rename to images/blink-06-final.png diff --git a/book/03-git-branching/images/branch-and-history.png b/images/branch-and-history.png similarity index 100% rename from book/03-git-branching/images/branch-and-history.png rename to images/branch-and-history.png diff --git a/book/A-git-in-other-environments/images/branch_widget_mac.png b/images/branch_widget_mac.png similarity index 100% rename from book/A-git-in-other-environments/images/branch_widget_mac.png rename to images/branch_widget_mac.png diff --git a/book/A-git-in-other-environments/images/branch_widget_win.png b/images/branch_widget_win.png similarity index 100% rename from book/A-git-in-other-environments/images/branch_widget_win.png rename to images/branch_widget_win.png diff --git a/book/01-introduction/images/centralized.png b/images/centralized.png similarity index 100% rename from book/01-introduction/images/centralized.png rename to images/centralized.png diff --git a/book/05-distributed-git/images/centralized_workflow.png b/images/centralized_workflow.png similarity index 100% rename from book/05-distributed-git/images/centralized_workflow.png rename to images/centralized_workflow.png diff --git a/book/03-git-branching/images/checkout-master.png b/images/checkout-master.png similarity index 100% rename from book/03-git-branching/images/checkout-master.png rename to images/checkout-master.png diff --git a/book/08-customizing-git/images/clean.png b/images/clean.png similarity index 100% rename from book/08-customizing-git/images/clean.png rename to images/clean.png diff --git a/book/06-github/images/collaborators.png b/images/collaborators.png similarity index 100% rename from book/06-github/images/collaborators.png rename to images/collaborators.png diff --git a/book/03-git-branching/images/commit-and-tree.png b/images/commit-and-tree.png similarity index 100% rename from book/03-git-branching/images/commit-and-tree.png rename to images/commit-and-tree.png diff --git a/book/03-git-branching/images/commits-and-parents.png b/images/commits-and-parents.png similarity index 100% rename from book/03-git-branching/images/commits-and-parents.png rename to images/commits-and-parents.png diff --git a/book/10-git-internals/images/data-model-1.png b/images/data-model-1.png similarity index 100% rename from book/10-git-internals/images/data-model-1.png rename to images/data-model-1.png diff --git a/book/10-git-internals/images/data-model-2.png b/images/data-model-2.png similarity index 100% rename from book/10-git-internals/images/data-model-2.png rename to images/data-model-2.png diff --git a/book/10-git-internals/images/data-model-3.png b/images/data-model-3.png similarity index 100% rename from book/10-git-internals/images/data-model-3.png rename to images/data-model-3.png diff --git a/book/10-git-internals/images/data-model-4.png b/images/data-model-4.png similarity index 100% rename from book/10-git-internals/images/data-model-4.png rename to images/data-model-4.png diff --git a/book/01-introduction/images/deltas.png b/images/deltas.png similarity index 100% rename from book/01-introduction/images/deltas.png rename to images/deltas.png diff --git a/book/01-introduction/images/distributed.png b/images/distributed.png similarity index 100% rename from book/01-introduction/images/distributed.png rename to images/distributed.png diff --git a/book/07-git-tools/images/double-dot.png b/images/double-dot.png similarity index 100% rename from book/07-git-tools/images/double-dot.png rename to images/double-dot.png diff --git a/book/A-git-in-other-environments/images/egit.png b/images/egit.png similarity index 100% rename from book/A-git-in-other-environments/images/egit.png rename to images/egit.png diff --git a/book/06-github/images/email-settings.png b/images/email-settings.png similarity index 100% rename from book/06-github/images/email-settings.png rename to images/email-settings.png diff --git a/book/06-github/images/emoji.png b/images/emoji.png similarity index 100% rename from book/06-github/images/emoji.png rename to images/emoji.png diff --git a/book/06-github/images/forkbutton.png b/images/forkbutton.png similarity index 100% rename from book/06-github/images/forkbutton.png rename to images/forkbutton.png diff --git a/book/A-git-in-other-environments/images/git-bash.png b/images/git-bash.png similarity index 100% rename from book/A-git-in-other-environments/images/git-bash.png rename to images/git-bash.png diff --git a/book/05-distributed-git/images/git-diff-check.png b/images/git-diff-check.png similarity index 100% rename from book/05-distributed-git/images/git-diff-check.png rename to images/git-diff-check.png diff --git a/book/09-git-and-other-scms/images/git-fusion-boot.png b/images/git-fusion-boot.png similarity index 100% rename from book/09-git-and-other-scms/images/git-fusion-boot.png rename to images/git-fusion-boot.png diff --git a/book/09-git-and-other-scms/images/git-fusion-perforce-graph.png b/images/git-fusion-perforce-graph.png similarity index 100% rename from book/09-git-and-other-scms/images/git-fusion-perforce-graph.png rename to images/git-fusion-perforce-graph.png diff --git a/book/A-git-in-other-environments/images/git-gui.png b/images/git-gui.png similarity index 100% rename from book/A-git-in-other-environments/images/git-gui.png rename to images/git-gui.png diff --git a/book/04-git-server/images/git-instaweb.png b/images/git-instaweb.png similarity index 100% rename from book/04-git-server/images/git-instaweb.png rename to images/git-instaweb.png diff --git a/book/01-introduction/images/git-osx-installer.png b/images/git-osx-installer.png similarity index 100% rename from book/01-introduction/images/git-osx-installer.png rename to images/git-osx-installer.png diff --git a/book/09-git-and-other-scms/images/git-tfs-ct.png b/images/git-tfs-ct.png similarity index 100% rename from book/09-git-and-other-scms/images/git-tfs-ct.png rename to images/git-tfs-ct.png diff --git a/book/A-git-in-other-environments/images/github_mac.png b/images/github_mac.png similarity index 100% rename from book/A-git-in-other-environments/images/github_mac.png rename to images/github_mac.png diff --git a/book/A-git-in-other-environments/images/github_win.png b/images/github_win.png similarity index 100% rename from book/A-git-in-other-environments/images/github_win.png rename to images/github_win.png diff --git a/book/A-git-in-other-environments/images/gitk.png b/images/gitk.png similarity index 100% rename from book/A-git-in-other-environments/images/gitk.png rename to images/gitk.png diff --git a/book/04-git-server/images/gitlab-groups.png b/images/gitlab-groups.png similarity index 100% rename from book/04-git-server/images/gitlab-groups.png rename to images/gitlab-groups.png diff --git a/book/04-git-server/images/gitlab-menu.png b/images/gitlab-menu.png similarity index 100% rename from book/04-git-server/images/gitlab-menu.png rename to images/gitlab-menu.png diff --git a/book/04-git-server/images/gitlab-users.png b/images/gitlab-users.png similarity index 100% rename from book/04-git-server/images/gitlab-users.png rename to images/gitlab-users.png diff --git a/book/03-git-branching/images/head-to-master.png b/images/head-to-master.png similarity index 100% rename from book/03-git-branching/images/head-to-master.png rename to images/head-to-master.png diff --git a/book/03-git-branching/images/head-to-testing.png b/images/head-to-testing.png similarity index 100% rename from book/03-git-branching/images/head-to-testing.png rename to images/head-to-testing.png diff --git a/book/05-distributed-git/images/integration-manager.png b/images/integration-manager.png similarity index 100% rename from book/05-distributed-git/images/integration-manager.png rename to images/integration-manager.png diff --git a/book/03-git-branching/images/interesting-rebase-1.png b/images/interesting-rebase-1.png similarity index 100% rename from book/03-git-branching/images/interesting-rebase-1.png rename to images/interesting-rebase-1.png diff --git a/book/03-git-branching/images/interesting-rebase-2.png b/images/interesting-rebase-2.png similarity index 100% rename from book/03-git-branching/images/interesting-rebase-2.png rename to images/interesting-rebase-2.png diff --git a/book/03-git-branching/images/interesting-rebase-3.png b/images/interesting-rebase-3.png similarity index 100% rename from book/03-git-branching/images/interesting-rebase-3.png rename to images/interesting-rebase-3.png diff --git a/book/03-git-branching/images/interesting-rebase-4.png b/images/interesting-rebase-4.png similarity index 100% rename from book/03-git-branching/images/interesting-rebase-4.png rename to images/interesting-rebase-4.png diff --git a/book/03-git-branching/images/interesting-rebase-5.png b/images/interesting-rebase-5.png similarity index 100% rename from book/03-git-branching/images/interesting-rebase-5.png rename to images/interesting-rebase-5.png diff --git a/book/05-distributed-git/images/large-merges-1.png b/images/large-merges-1.png similarity index 100% rename from book/05-distributed-git/images/large-merges-1.png rename to images/large-merges-1.png diff --git a/book/05-distributed-git/images/large-merges-2.png b/images/large-merges-2.png similarity index 100% rename from book/05-distributed-git/images/large-merges-2.png rename to images/large-merges-2.png diff --git a/book/02-git-basics/images/lifecycle.png b/images/lifecycle.png similarity index 100% rename from book/02-git-basics/images/lifecycle.png rename to images/lifecycle.png diff --git a/book/01-introduction/images/local.png b/images/local.png similarity index 100% rename from book/01-introduction/images/local.png rename to images/local.png diff --git a/book/03-git-branching/images/lr-branches-1.png b/images/lr-branches-1.png similarity index 100% rename from book/03-git-branching/images/lr-branches-1.png rename to images/lr-branches-1.png diff --git a/book/03-git-branching/images/lr-branches-2.png b/images/lr-branches-2.png similarity index 100% rename from book/03-git-branching/images/lr-branches-2.png rename to images/lr-branches-2.png diff --git a/book/06-github/images/maint-01-email.png b/images/maint-01-email.png similarity index 100% rename from book/06-github/images/maint-01-email.png rename to images/maint-01-email.png diff --git a/book/06-github/images/maint-02-merge.png b/images/maint-02-merge.png similarity index 100% rename from book/06-github/images/maint-02-merge.png rename to images/maint-02-merge.png diff --git a/book/06-github/images/maint-03-email-resp.png b/images/maint-03-email-resp.png similarity index 100% rename from book/06-github/images/maint-03-email-resp.png rename to images/maint-03-email-resp.png diff --git a/book/06-github/images/maint-04-target.png b/images/maint-04-target.png similarity index 100% rename from book/06-github/images/maint-04-target.png rename to images/maint-04-target.png diff --git a/book/06-github/images/maint-05-mentions.png b/images/maint-05-mentions.png similarity index 100% rename from book/06-github/images/maint-05-mentions.png rename to images/maint-05-mentions.png diff --git a/book/06-github/images/maint-06-unsubscribe.png b/images/maint-06-unsubscribe.png similarity index 100% rename from book/06-github/images/maint-06-unsubscribe.png rename to images/maint-06-unsubscribe.png diff --git a/book/06-github/images/maint-07-notifications.png b/images/maint-07-notifications.png similarity index 100% rename from book/06-github/images/maint-07-notifications.png rename to images/maint-07-notifications.png diff --git a/book/06-github/images/maint-08-notifications-page.png b/images/maint-08-notifications-page.png similarity index 100% rename from book/06-github/images/maint-08-notifications-page.png rename to images/maint-08-notifications-page.png diff --git a/book/06-github/images/maint-09-contrib.png b/images/maint-09-contrib.png similarity index 100% rename from book/06-github/images/maint-09-contrib.png rename to images/maint-09-contrib.png diff --git a/book/06-github/images/maint-10-default-branch.png b/images/maint-10-default-branch.png similarity index 100% rename from book/06-github/images/maint-10-default-branch.png rename to images/maint-10-default-branch.png diff --git a/book/06-github/images/maint-11-transfer.png b/images/maint-11-transfer.png similarity index 100% rename from book/06-github/images/maint-11-transfer.png rename to images/maint-11-transfer.png diff --git a/book/05-distributed-git/images/managed-team-1.png b/images/managed-team-1.png similarity index 100% rename from book/05-distributed-git/images/managed-team-1.png rename to images/managed-team-1.png diff --git a/book/05-distributed-git/images/managed-team-2.png b/images/managed-team-2.png similarity index 100% rename from book/05-distributed-git/images/managed-team-2.png rename to images/managed-team-2.png diff --git a/book/05-distributed-git/images/managed-team-3.png b/images/managed-team-3.png similarity index 100% rename from book/05-distributed-git/images/managed-team-3.png rename to images/managed-team-3.png diff --git a/book/05-distributed-git/images/managed-team-flow.png b/images/managed-team-flow.png similarity index 100% rename from book/05-distributed-git/images/managed-team-flow.png rename to images/managed-team-flow.png diff --git a/book/06-github/images/markdown-01-example.png b/images/markdown-01-example.png similarity index 100% rename from book/06-github/images/markdown-01-example.png rename to images/markdown-01-example.png diff --git a/book/06-github/images/markdown-02-tasks.png b/images/markdown-02-tasks.png similarity index 100% rename from book/06-github/images/markdown-02-tasks.png rename to images/markdown-02-tasks.png diff --git a/book/06-github/images/markdown-03-task-summary.png b/images/markdown-03-task-summary.png similarity index 100% rename from book/06-github/images/markdown-03-task-summary.png rename to images/markdown-03-task-summary.png diff --git a/book/06-github/images/markdown-04-fenced-code.png b/images/markdown-04-fenced-code.png similarity index 100% rename from book/06-github/images/markdown-04-fenced-code.png rename to images/markdown-04-fenced-code.png diff --git a/book/06-github/images/markdown-05-quote.png b/images/markdown-05-quote.png similarity index 100% rename from book/06-github/images/markdown-05-quote.png rename to images/markdown-05-quote.png diff --git a/book/06-github/images/markdown-06-emoji-complete.png b/images/markdown-06-emoji-complete.png similarity index 100% rename from book/06-github/images/markdown-06-emoji-complete.png rename to images/markdown-06-emoji-complete.png diff --git a/book/06-github/images/markdown-07-emoji.png b/images/markdown-07-emoji.png similarity index 100% rename from book/06-github/images/markdown-07-emoji.png rename to images/markdown-07-emoji.png diff --git a/book/06-github/images/markdown-08-drag-drop.png b/images/markdown-08-drag-drop.png similarity index 100% rename from book/06-github/images/markdown-08-drag-drop.png rename to images/markdown-08-drag-drop.png diff --git a/book/06-github/images/mentions-01-syntax.png b/images/mentions-01-syntax.png similarity index 100% rename from book/06-github/images/mentions-01-syntax.png rename to images/mentions-01-syntax.png diff --git a/book/06-github/images/mentions-02-render.png b/images/mentions-02-render.png similarity index 100% rename from book/06-github/images/mentions-02-render.png rename to images/mentions-02-render.png diff --git a/book/06-github/images/mentions-03-closed.png b/images/mentions-03-closed.png similarity index 100% rename from book/06-github/images/mentions-03-closed.png rename to images/mentions-03-closed.png diff --git a/book/05-distributed-git/images/merging-workflows-1.png b/images/merging-workflows-1.png similarity index 100% rename from book/05-distributed-git/images/merging-workflows-1.png rename to images/merging-workflows-1.png diff --git a/book/05-distributed-git/images/merging-workflows-2.png b/images/merging-workflows-2.png similarity index 100% rename from book/05-distributed-git/images/merging-workflows-2.png rename to images/merging-workflows-2.png diff --git a/book/05-distributed-git/images/merging-workflows-3.png b/images/merging-workflows-3.png similarity index 100% rename from book/05-distributed-git/images/merging-workflows-3.png rename to images/merging-workflows-3.png diff --git a/book/05-distributed-git/images/merging-workflows-4.png b/images/merging-workflows-4.png similarity index 100% rename from book/05-distributed-git/images/merging-workflows-4.png rename to images/merging-workflows-4.png diff --git a/book/05-distributed-git/images/merging-workflows-5.png b/images/merging-workflows-5.png similarity index 100% rename from book/05-distributed-git/images/merging-workflows-5.png rename to images/merging-workflows-5.png diff --git a/book/06-github/images/new-repo.png b/images/new-repo.png similarity index 100% rename from book/06-github/images/new-repo.png rename to images/new-repo.png diff --git a/book/06-github/images/neworg.png b/images/neworg.png similarity index 100% rename from book/06-github/images/neworg.png rename to images/neworg.png diff --git a/book/06-github/images/newrepo.png b/images/newrepo.png similarity index 100% rename from book/06-github/images/newrepo.png rename to images/newrepo.png diff --git a/book/06-github/images/newrepoform.png b/images/newrepoform.png similarity index 100% rename from book/06-github/images/newrepoform.png rename to images/newrepoform.png diff --git a/book/06-github/images/notifications.png b/images/notifications.png similarity index 100% rename from book/06-github/images/notifications.png rename to images/notifications.png diff --git a/book/06-github/images/orgs-01-page.png b/images/orgs-01-page.png similarity index 100% rename from book/06-github/images/orgs-01-page.png rename to images/orgs-01-page.png diff --git a/book/06-github/images/orgs-02-teams.png b/images/orgs-02-teams.png similarity index 100% rename from book/06-github/images/orgs-02-teams.png rename to images/orgs-02-teams.png diff --git a/book/06-github/images/orgs-03-audit.png b/images/orgs-03-audit.png similarity index 100% rename from book/06-github/images/orgs-03-audit.png rename to images/orgs-03-audit.png diff --git a/book/08-customizing-git/images/p4merge.png b/images/p4merge.png similarity index 100% rename from book/08-customizing-git/images/p4merge.png rename to images/p4merge.png diff --git a/book/03-git-branching/images/perils-of-rebasing-1.png b/images/perils-of-rebasing-1.png similarity index 100% rename from book/03-git-branching/images/perils-of-rebasing-1.png rename to images/perils-of-rebasing-1.png diff --git a/book/03-git-branching/images/perils-of-rebasing-2.png b/images/perils-of-rebasing-2.png similarity index 100% rename from book/03-git-branching/images/perils-of-rebasing-2.png rename to images/perils-of-rebasing-2.png diff --git a/book/03-git-branching/images/perils-of-rebasing-3.png b/images/perils-of-rebasing-3.png similarity index 100% rename from book/03-git-branching/images/perils-of-rebasing-3.png rename to images/perils-of-rebasing-3.png diff --git a/book/03-git-branching/images/perils-of-rebasing-4.png b/images/perils-of-rebasing-4.png similarity index 100% rename from book/03-git-branching/images/perils-of-rebasing-4.png rename to images/perils-of-rebasing-4.png diff --git a/book/03-git-branching/images/perils-of-rebasing-5.png b/images/perils-of-rebasing-5.png similarity index 100% rename from book/03-git-branching/images/perils-of-rebasing-5.png rename to images/perils-of-rebasing-5.png diff --git a/book/A-git-in-other-environments/images/posh-git.png b/images/posh-git.png similarity index 100% rename from book/A-git-in-other-environments/images/posh-git.png rename to images/posh-git.png diff --git a/book/06-github/images/pr-01-fail.png b/images/pr-01-fail.png similarity index 100% rename from book/06-github/images/pr-01-fail.png rename to images/pr-01-fail.png diff --git a/book/06-github/images/pr-02-merge-fix.png b/images/pr-02-merge-fix.png similarity index 100% rename from book/06-github/images/pr-02-merge-fix.png rename to images/pr-02-merge-fix.png diff --git a/book/05-distributed-git/images/public-small-1.png b/images/public-small-1.png similarity index 100% rename from book/05-distributed-git/images/public-small-1.png rename to images/public-small-1.png diff --git a/book/05-distributed-git/images/public-small-2.png b/images/public-small-2.png similarity index 100% rename from book/05-distributed-git/images/public-small-2.png rename to images/public-small-2.png diff --git a/book/05-distributed-git/images/public-small-3.png b/images/public-small-3.png similarity index 100% rename from book/05-distributed-git/images/public-small-3.png rename to images/public-small-3.png diff --git a/book/05-distributed-git/images/rebasing-1.png b/images/rebasing-1.png similarity index 100% rename from book/05-distributed-git/images/rebasing-1.png rename to images/rebasing-1.png diff --git a/book/05-distributed-git/images/rebasing-2.png b/images/rebasing-2.png similarity index 100% rename from book/05-distributed-git/images/rebasing-2.png rename to images/rebasing-2.png diff --git a/book/03-git-branching/images/remote-branches-1.png b/images/remote-branches-1.png similarity index 100% rename from book/03-git-branching/images/remote-branches-1.png rename to images/remote-branches-1.png diff --git a/book/03-git-branching/images/remote-branches-2.png b/images/remote-branches-2.png similarity index 100% rename from book/03-git-branching/images/remote-branches-2.png rename to images/remote-branches-2.png diff --git a/book/03-git-branching/images/remote-branches-3.png b/images/remote-branches-3.png similarity index 100% rename from book/03-git-branching/images/remote-branches-3.png rename to images/remote-branches-3.png diff --git a/book/03-git-branching/images/remote-branches-4.png b/images/remote-branches-4.png similarity index 100% rename from book/03-git-branching/images/remote-branches-4.png rename to images/remote-branches-4.png diff --git a/book/03-git-branching/images/remote-branches-5.png b/images/remote-branches-5.png similarity index 100% rename from book/03-git-branching/images/remote-branches-5.png rename to images/remote-branches-5.png diff --git a/book/07-git-tools/images/replace1.png b/images/replace1.png similarity index 100% rename from book/07-git-tools/images/replace1.png rename to images/replace1.png diff --git a/book/07-git-tools/images/replace2.png b/images/replace2.png similarity index 100% rename from book/07-git-tools/images/replace2.png rename to images/replace2.png diff --git a/book/07-git-tools/images/replace3.png b/images/replace3.png similarity index 100% rename from book/07-git-tools/images/replace3.png rename to images/replace3.png diff --git a/book/07-git-tools/images/replace4.png b/images/replace4.png similarity index 100% rename from book/07-git-tools/images/replace4.png rename to images/replace4.png diff --git a/book/07-git-tools/images/replace5.png b/images/replace5.png similarity index 100% rename from book/07-git-tools/images/replace5.png rename to images/replace5.png diff --git a/book/06-github/images/reposettingslink.png b/images/reposettingslink.png similarity index 100% rename from book/06-github/images/reposettingslink.png rename to images/reposettingslink.png diff --git a/book/07-git-tools/images/rerere1.png b/images/rerere1.png similarity index 100% rename from book/07-git-tools/images/rerere1.png rename to images/rerere1.png diff --git a/book/07-git-tools/images/rerere2.png b/images/rerere2.png similarity index 100% rename from book/07-git-tools/images/rerere2.png rename to images/rerere2.png diff --git a/book/07-git-tools/images/rerere3.png b/images/rerere3.png similarity index 100% rename from book/07-git-tools/images/rerere3.png rename to images/rerere3.png diff --git a/book/07-git-tools/images/reset-checkout.png b/images/reset-checkout.png similarity index 100% rename from book/07-git-tools/images/reset-checkout.png rename to images/reset-checkout.png diff --git a/book/07-git-tools/images/reset-ex1.png b/images/reset-ex1.png similarity index 100% rename from book/07-git-tools/images/reset-ex1.png rename to images/reset-ex1.png diff --git a/book/07-git-tools/images/reset-ex2.png b/images/reset-ex2.png similarity index 100% rename from book/07-git-tools/images/reset-ex2.png rename to images/reset-ex2.png diff --git a/book/07-git-tools/images/reset-ex3.png b/images/reset-ex3.png similarity index 100% rename from book/07-git-tools/images/reset-ex3.png rename to images/reset-ex3.png diff --git a/book/07-git-tools/images/reset-ex4.png b/images/reset-ex4.png similarity index 100% rename from book/07-git-tools/images/reset-ex4.png rename to images/reset-ex4.png diff --git a/book/07-git-tools/images/reset-ex5.png b/images/reset-ex5.png similarity index 100% rename from book/07-git-tools/images/reset-ex5.png rename to images/reset-ex5.png diff --git a/book/07-git-tools/images/reset-ex6.png b/images/reset-ex6.png similarity index 100% rename from book/07-git-tools/images/reset-ex6.png rename to images/reset-ex6.png diff --git a/book/07-git-tools/images/reset-hard.png b/images/reset-hard.png similarity index 100% rename from book/07-git-tools/images/reset-hard.png rename to images/reset-hard.png diff --git a/book/07-git-tools/images/reset-mixed.png b/images/reset-mixed.png similarity index 100% rename from book/07-git-tools/images/reset-mixed.png rename to images/reset-mixed.png diff --git a/book/07-git-tools/images/reset-path1.png b/images/reset-path1.png similarity index 100% rename from book/07-git-tools/images/reset-path1.png rename to images/reset-path1.png diff --git a/book/07-git-tools/images/reset-path2.png b/images/reset-path2.png similarity index 100% rename from book/07-git-tools/images/reset-path2.png rename to images/reset-path2.png diff --git a/book/07-git-tools/images/reset-path3.png b/images/reset-path3.png similarity index 100% rename from book/07-git-tools/images/reset-path3.png rename to images/reset-path3.png diff --git a/book/07-git-tools/images/reset-soft.png b/images/reset-soft.png similarity index 100% rename from book/07-git-tools/images/reset-soft.png rename to images/reset-soft.png diff --git a/book/07-git-tools/images/reset-squash-r1.png b/images/reset-squash-r1.png similarity index 100% rename from book/07-git-tools/images/reset-squash-r1.png rename to images/reset-squash-r1.png diff --git a/book/07-git-tools/images/reset-squash-r2.png b/images/reset-squash-r2.png similarity index 100% rename from book/07-git-tools/images/reset-squash-r2.png rename to images/reset-squash-r2.png diff --git a/book/07-git-tools/images/reset-squash-r3.png b/images/reset-squash-r3.png similarity index 100% rename from book/07-git-tools/images/reset-squash-r3.png rename to images/reset-squash-r3.png diff --git a/book/07-git-tools/images/reset-start.png b/images/reset-start.png similarity index 100% rename from book/07-git-tools/images/reset-start.png rename to images/reset-start.png diff --git a/book/07-git-tools/images/reset-workflow.png b/images/reset-workflow.png similarity index 100% rename from book/07-git-tools/images/reset-workflow.png rename to images/reset-workflow.png diff --git a/book/06-github/images/scripting-01-services.png b/images/scripting-01-services.png similarity index 100% rename from book/06-github/images/scripting-01-services.png rename to images/scripting-01-services.png diff --git a/book/06-github/images/scripting-02-email-service.png b/images/scripting-02-email-service.png similarity index 100% rename from book/06-github/images/scripting-02-email-service.png rename to images/scripting-02-email-service.png diff --git a/book/06-github/images/scripting-03-webhook.png b/images/scripting-03-webhook.png similarity index 100% rename from book/06-github/images/scripting-03-webhook.png rename to images/scripting-03-webhook.png diff --git a/book/06-github/images/scripting-04-webhook-debug.png b/images/scripting-04-webhook-debug.png similarity index 100% rename from book/06-github/images/scripting-04-webhook-debug.png rename to images/scripting-04-webhook-debug.png diff --git a/book/06-github/images/scripting-05-access-token.png b/images/scripting-05-access-token.png similarity index 100% rename from book/06-github/images/scripting-05-access-token.png rename to images/scripting-05-access-token.png diff --git a/book/06-github/images/scripting-06-comment.png b/images/scripting-06-comment.png similarity index 100% rename from book/06-github/images/scripting-06-comment.png rename to images/scripting-06-comment.png diff --git a/book/06-github/images/scripting-07-status.png b/images/scripting-07-status.png similarity index 100% rename from book/06-github/images/scripting-07-status.png rename to images/scripting-07-status.png diff --git a/book/06-github/images/signup.png b/images/signup.png similarity index 100% rename from book/06-github/images/signup.png rename to images/signup.png diff --git a/book/05-distributed-git/images/small-team-1.png b/images/small-team-1.png similarity index 100% rename from book/05-distributed-git/images/small-team-1.png rename to images/small-team-1.png diff --git a/book/05-distributed-git/images/small-team-2.png b/images/small-team-2.png similarity index 100% rename from book/05-distributed-git/images/small-team-2.png rename to images/small-team-2.png diff --git a/book/05-distributed-git/images/small-team-3.png b/images/small-team-3.png similarity index 100% rename from book/05-distributed-git/images/small-team-3.png rename to images/small-team-3.png diff --git a/book/05-distributed-git/images/small-team-4.png b/images/small-team-4.png similarity index 100% rename from book/05-distributed-git/images/small-team-4.png rename to images/small-team-4.png diff --git a/book/05-distributed-git/images/small-team-5.png b/images/small-team-5.png similarity index 100% rename from book/05-distributed-git/images/small-team-5.png rename to images/small-team-5.png diff --git a/book/05-distributed-git/images/small-team-6.png b/images/small-team-6.png similarity index 100% rename from book/05-distributed-git/images/small-team-6.png rename to images/small-team-6.png diff --git a/book/05-distributed-git/images/small-team-7.png b/images/small-team-7.png similarity index 100% rename from book/05-distributed-git/images/small-team-7.png rename to images/small-team-7.png diff --git a/book/05-distributed-git/images/small-team-flow.png b/images/small-team-flow.png similarity index 100% rename from book/05-distributed-git/images/small-team-flow.png rename to images/small-team-flow.png diff --git a/book/08-customizing-git/images/smudge.png b/images/smudge.png similarity index 100% rename from book/08-customizing-git/images/smudge.png rename to images/smudge.png diff --git a/book/01-introduction/images/snapshots.png b/images/snapshots.png similarity index 100% rename from book/01-introduction/images/snapshots.png rename to images/snapshots.png diff --git a/book/06-github/images/ssh-keys.png b/images/ssh-keys.png similarity index 100% rename from book/06-github/images/ssh-keys.png rename to images/ssh-keys.png diff --git a/book/03-git-branching/images/topic-branches-1.png b/images/topic-branches-1.png similarity index 100% rename from book/03-git-branching/images/topic-branches-1.png rename to images/topic-branches-1.png diff --git a/book/03-git-branching/images/topic-branches-2.png b/images/topic-branches-2.png similarity index 100% rename from book/03-git-branching/images/topic-branches-2.png rename to images/topic-branches-2.png diff --git a/book/03-git-branching/images/two-branches.png b/images/two-branches.png similarity index 100% rename from book/03-git-branching/images/two-branches.png rename to images/two-branches.png diff --git a/book/07-git-tools/images/undomerge-reset.png b/images/undomerge-reset.png similarity index 100% rename from book/07-git-tools/images/undomerge-reset.png rename to images/undomerge-reset.png diff --git a/book/07-git-tools/images/undomerge-revert.png b/images/undomerge-revert.png similarity index 100% rename from book/07-git-tools/images/undomerge-revert.png rename to images/undomerge-revert.png diff --git a/book/07-git-tools/images/undomerge-revert2.png b/images/undomerge-revert2.png similarity index 100% rename from book/07-git-tools/images/undomerge-revert2.png rename to images/undomerge-revert2.png diff --git a/book/07-git-tools/images/undomerge-revert3.png b/images/undomerge-revert3.png similarity index 100% rename from book/07-git-tools/images/undomerge-revert3.png rename to images/undomerge-revert3.png diff --git a/book/07-git-tools/images/undomerge-start.png b/images/undomerge-start.png similarity index 100% rename from book/07-git-tools/images/undomerge-start.png rename to images/undomerge-start.png diff --git a/book/A-git-in-other-environments/images/vs-1.png b/images/vs-1.png similarity index 100% rename from book/A-git-in-other-environments/images/vs-1.png rename to images/vs-1.png diff --git a/book/A-git-in-other-environments/images/vs-2.png b/images/vs-2.png similarity index 100% rename from book/A-git-in-other-environments/images/vs-2.png rename to images/vs-2.png diff --git a/book/06-github/images/your-profile.png b/images/your-profile.png similarity index 100% rename from book/06-github/images/your-profile.png rename to images/your-profile.png diff --git a/book/A-git-in-other-environments/images/zsh-oh-my.png b/images/zsh-oh-my.png similarity index 100% rename from book/A-git-in-other-environments/images/zsh-oh-my.png rename to images/zsh-oh-my.png diff --git a/book/A-git-in-other-environments/images/zsh-prompt.png b/images/zsh-prompt.png similarity index 100% rename from book/A-git-in-other-environments/images/zsh-prompt.png rename to images/zsh-prompt.png