wayfarer 0.4.1 → 0.4.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +10 -0
- data/Gemfile.lock +15 -11
- data/docs/cookbook/batch_routing.md +22 -0
- data/docs/cookbook/consent_screen.md +36 -0
- data/docs/cookbook/executing_javascript.md +41 -0
- data/docs/cookbook/navigation.md +43 -0
- data/docs/cookbook/querying_html.md +3 -3
- data/docs/cookbook/screenshots.md +2 -2
- data/docs/guides/callbacks.md +5 -5
- data/docs/guides/debugging.md +17 -0
- data/docs/guides/error_handling.md +22 -26
- data/docs/guides/jobs.md +44 -18
- data/docs/guides/navigation.md +73 -0
- data/docs/guides/{browser_automation → networking}/capybara.md +9 -4
- data/docs/guides/{browser_automation → networking}/custom_adapters.md +0 -0
- data/docs/guides/{browser_automation → networking}/ferrum.md +3 -1
- data/docs/guides/networking/http.md +33 -0
- data/docs/guides/{browser_automation → networking}/selenium.md +4 -2
- data/docs/guides/pages.md +4 -4
- data/docs/guides/performance.md +108 -0
- data/docs/guides/reliability.md +41 -0
- data/docs/guides/routing/steering.md +30 -0
- data/docs/guides/tasks.md +9 -33
- data/docs/reference/api/base.md +13 -127
- data/docs/reference/api/route.md +1 -1
- data/docs/reference/cli.md +0 -78
- data/docs/reference/configuration_keys.md +1 -1
- data/lib/wayfarer/base.rb +37 -27
- data/lib/wayfarer/cli/base.rb +19 -1
- data/lib/wayfarer/cli/job.rb +5 -11
- data/lib/wayfarer/cli/route.rb +4 -2
- data/lib/wayfarer/cli/templates/job.rb.tt +3 -1
- data/lib/wayfarer/config/networking.rb +1 -1
- data/lib/wayfarer/config/struct.rb +1 -1
- data/lib/wayfarer/gc.rb +3 -4
- data/lib/wayfarer/handler.rb +15 -0
- data/lib/wayfarer/middleware/base.rb +19 -0
- data/lib/wayfarer/middleware/chain.rb +8 -0
- data/lib/wayfarer/middleware/controller.rb +40 -0
- data/lib/wayfarer/middleware/dedup.rb +5 -0
- data/lib/wayfarer/middleware/dispatch.rb +22 -0
- data/lib/wayfarer/middleware/fetch.rb +33 -13
- data/lib/wayfarer/middleware/lazy.rb +11 -0
- data/lib/wayfarer/middleware/normalize.rb +2 -0
- data/lib/wayfarer/middleware/router.rb +41 -3
- data/lib/wayfarer/middleware/stage.rb +6 -2
- data/lib/wayfarer/networking/context.rb +1 -0
- data/lib/wayfarer/networking/ferrum.rb +1 -0
- data/lib/wayfarer/networking/follow.rb +22 -0
- data/lib/wayfarer/networking/pool.rb +9 -8
- data/lib/wayfarer/networking/result.rb +0 -8
- data/lib/wayfarer/page.rb +1 -1
- data/lib/wayfarer/routing/matchers/custom.rb +2 -0
- data/lib/wayfarer/routing/matchers/host.rb +3 -1
- data/lib/wayfarer/routing/matchers/path.rb +2 -1
- data/lib/wayfarer/routing/result.rb +0 -5
- data/lib/wayfarer/routing/route.rb +6 -0
- data/lib/wayfarer/routing/router.rb +28 -0
- data/lib/wayfarer/serializer.rb +2 -2
- data/lib/wayfarer/stringify.rb +13 -7
- data/lib/wayfarer/task.rb +4 -2
- data/lib/wayfarer.rb +2 -7
- data/spec/base_spec.rb +33 -42
- data/spec/callbacks_spec.rb +2 -2
- data/spec/cli/job_spec.rb +9 -5
- data/spec/config/networking_spec.rb +2 -2
- data/spec/factories/{queue/middleware.rb → middleware.rb} +3 -3
- data/spec/factories/{queue/page.rb → page.rb} +3 -3
- data/spec/factories/{queue/task.rb → task.rb} +0 -0
- data/spec/fixtures/dummy_job.rb +1 -1
- data/spec/gc_spec.rb +5 -9
- data/spec/handler_spec.rb +11 -0
- data/spec/integration/callbacks_spec.rb +85 -0
- data/spec/integration/page_spec.rb +62 -0
- data/spec/integration/params_spec.rb +56 -0
- data/spec/integration/stage_spec.rb +51 -0
- data/spec/integration/steering_spec.rb +57 -0
- data/spec/middleware/chain_spec.rb +32 -19
- data/spec/middleware/controller_spec.rb +86 -0
- data/spec/middleware/dedup_spec.rb +20 -8
- data/spec/middleware/dispatch_spec.rb +43 -0
- data/spec/middleware/fetch_spec.rb +116 -45
- data/spec/middleware/normalize_spec.rb +5 -4
- data/spec/middleware/router_spec.rb +80 -28
- data/spec/middleware/stage_spec.rb +42 -19
- data/spec/networking/follow_spec.rb +41 -0
- data/spec/routing/router_spec.rb +24 -0
- data/spec/spec_helpers.rb +11 -3
- data/spec/support/static/git-scm.com/assets/application-38b0d42ff05ffea45841edebbd14b75b89585646153808e82907c2c5c11f324b.js +772 -0
- data/spec/support/static/git-scm.com/assets/application-cafcf280f67db0e6d8168ba98a38da878769a9d5f37793b68ffb963a02d185e0.css +1 -0
- data/spec/support/static/git-scm.com/assets/modernize-b3ebe0c31c24f230dc62179d3e1030d2e57a53b1668d9382c0a27dbd44a94beb.js +20 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-Bash.html +751 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-PowerShell.html +804 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-Sublime-Text.html +728 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-Visual-Studio-Code.html +751 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-Visual-Studio.html +740 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-Zsh.html +765 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Graphical-Interfaces.html +931 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Summary.html +702 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-B:-Embedding-Git-in-your-Applications-Command-line-Git.html +720 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-B:-Embedding-Git-in-your-Applications-Dulwich.html +746 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-B:-Embedding-Git-in-your-Applications-JGit.html +889 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-B:-Embedding-Git-in-your-Applications-Libgit2.html +1003 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-B:-Embedding-Git-in-your-Applications-go-git.html +792 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Administration.html +745 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Basic-Snapshotting.html +840 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Branching-and-Merging.html +829 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Debugging.html +731 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Email.html +766 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-External-Systems.html +721 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Getting-and-Creating-Projects.html +746 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Inspection-and-Comparison.html +735 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Patching.html +742 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Plumbing-Commands.html +715 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Setup-and-Config.html +863 -0
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Sharing-and-Updating-Projects.html +802 -0
- data/spec/support/static/git-scm.com/book/en/v2/Customizing-Git-An-Example-Git-Enforced-Policy.html +1200 -0
- data/spec/support/static/git-scm.com/book/en/v2/Customizing-Git-Git-Attributes.html +1134 -0
- data/spec/support/static/git-scm.com/book/en/v2/Customizing-Git-Git-Configuration.html +1315 -0
- data/spec/support/static/git-scm.com/book/en/v2/Customizing-Git-Git-Hooks.html +876 -0
- data/spec/support/static/git-scm.com/book/en/v2/Customizing-Git-Summary.html +704 -0
- data/spec/support/static/git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project.html +1667 -0
- data/spec/support/static/git-scm.com/book/en/v2/Distributed-Git-Distributed-Workflows.html +859 -0
- data/spec/support/static/git-scm.com/book/en/v2/Distributed-Git-Maintaining-a-Project.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/Distributed-Git-Summary.html +704 -0
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-A-Short-History-of-Git.html +735 -0
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-About-Version-Control.html +783 -0
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup.html +889 -0
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-Getting-Help.html +750 -0
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-Installing-Git.html +879 -0
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-Summary.html +704 -0
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-The-Command-Line.html +711 -0
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-What-is-Git?.html +857 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository.html +816 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Git-Aliases.html +775 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository.html +1432 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Summary.html +703 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Tagging.html +1049 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Undoing-Things.html +998 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Viewing-the-Commit-History.html +1172 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes.html +983 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging.html +1102 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Branch-Management.html +946 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell.html +1020 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Branching-Workflows.html +786 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Rebasing.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Remote-Branches.html +1009 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Summary.html +705 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Environment-Variables.html +1009 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Git-Objects.html +1209 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Git-References.html +939 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Maintenance-and-Data-Recovery.html +1086 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Packfiles.html +876 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Plumbing-and-Porcelain.html +745 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Summary.html +708 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-The-Refspec.html +872 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols.html +1043 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Advanced-Merging.html +1605 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Bundling.html +888 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Credential-Storage.html +1035 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Debugging-with-Git.html +861 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Interactive-Staging.html +920 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Replace.html +949 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Rerere.html +983 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Reset-Demystified.html +1236 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Revision-Selection.html +1178 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Rewriting-History.html +1182 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Searching.html +875 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work.html +922 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning.html +1039 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Submodules.html +1864 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Summary.html +705 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-and-Other-Systems-Git-as-a-Client.html +2656 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git.html +1741 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-and-Other-Systems-Summary.html +703 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Generating-Your-SSH-Public-Key.html +759 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Getting-Git-on-a-Server.html +827 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Git-Daemon.html +775 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-GitLab.html +872 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-GitWeb.html +776 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Setting-Up-the-Server.html +870 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Smart-HTTP.html +789 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Summary.html +709 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols.html +963 -0
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Third-Party-Hosted-Options.html +711 -0
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Account-Setup-and-Configuration.html +858 -0
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Maintaining-a-Project.html +1218 -0
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Managing-an-organization.html +797 -0
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Scripting-GitHub.html +1059 -0
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Summary.html +704 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_abort_merge.html +1605 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_add_email_addresses.html +858 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_advanced_merging.html +1605 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_an_example_git_enforced_policy.html +1200 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_annotated_tags.html +1049 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_api_comment.html +1059 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_bare_repo.html +827 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_basic_branching.html +1102 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_basic_merge_conflicts.html +1102 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_basic_merging.html +1102 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_binary_search.html +861 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_branch_management.html +946 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_branch_references.html +1178 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_build_number.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_bundling.html +888 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_changing_multiple.html +1182 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_checking_out_conflicts.html +1605 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_checking_out_remotes.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_checking_status.html +1432 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_cloning_submodules.html +1864 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_commit_guidelines.html +1667 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_commit_ranges.html +1178 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_commit_status.html +1059 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_committing_changes.html +1432 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_contrib_file.html +1218 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_contributing_project.html +1667 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_create_new_branch.html +1020 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_credential_caching.html +1035 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_custom_importer.html +1741 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_data_recovery.html +1086 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_delete_branches.html +1009 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_editor.html +889 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_eg_task_lists.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_email_hooks.html +876 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_email_notification.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_email_notifications.html +1218 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_email_pr.html +1218 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_enforcing_commit_message_format.html +1200 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_example_markdown.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_external_merge_tools.html +1315 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_fetch_and_push_on_different_repositories.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_fetching_and_pulling.html +983 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_file_annotation.html +861 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_first_time.html +889 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_generate_ssh_key.html +759 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_getting_a_repo.html +816 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_getting_git_on_a_server.html +827 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_aliases.html +775 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_am.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_amend.html +1182 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_branches_overview.html +1020 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_clean.html +1039 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_cloning.html +816 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_commit_objects.html +1209 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_config.html +1315 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_diff_staged.html +1432 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_gc.html +1086 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_grep.html +875 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_help.html +750 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_hooks.html +876 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_mv.html +1432 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_p4.html +1741 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_p4_branches.html +2656 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_reflog.html +1178 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_refs.html +939 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_reset.html +1236 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_stashing.html +1039 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_submodules.html +1864 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_svn.html +2656 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_tagging.html +1049 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_gitlab_groups_section.html +872 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_ignoring.html +1432 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_inspecting_remote.html +983 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_integration_manager.html +859 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_interactive_staging.html +920 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_keyword_expansion.html +1134 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_libgit2_bindings.html +1003 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_manual_remerge.html +1605 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_md_code.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_md_drag.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_md_emoji.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_md_quote.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_merge_button.html +1218 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_merge_log.html +1605 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_merge_rebase_work.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_new_repo_dropdown.html +1218 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_not_center.html +1218 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_org_page.html +797 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_other_client_hooks.html +876 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_p4_git_fusion.html +2656 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_patches_from_email.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_personal_avatar.html +858 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_plumbing_porcelain.html +745 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_closed.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_discussion.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_fail.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_final.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_references.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_references_render.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_refs.html +1218 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pre_merge_rebase_work.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_preparing_release.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_private_team.html +1667 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_project_over_email.html +1667 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_public_project.html +1667 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_publishing_submodules.html +1864 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pushing_branches.html +1009 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pushing_refspecs.html +872 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pushing_remotes.html +983 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rebase_cherry_pick.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rebase_peril.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rebase_rebase.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rebase_rebase_work.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rebasing.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_refspec.html +872 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_remote_branches.html +1009 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_remote_repos.html +983 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_removing_file_every_commit.html +1182 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_removing_files.html +1432 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_removing_objects.html +1086 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_replace.html +949 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_reverse_commit.html +1605 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_revision_selection.html +1178 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rewriting_history.html +1182 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_searching.html +875 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_service_config.html +1059 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_services_hooks.html +1059 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_setting_up_server.html +870 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_sharing_tags.html +1049 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_signing.html +922 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_signing_commits.html +922 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_squashing.html +1182 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_starting_submodules.html +1864 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_subtree_merge.html +1605 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_switching_branches.html +1020 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_tagging_releases.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_task_list_progress.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_team_page.html +797 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_the_index.html +1236 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_the_shortlog.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_topic_branch.html +786 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_tracking_branches.html +1009 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_tracking_files.html +1432 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_tree_objects.html +1209 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_triple_dot.html +1178 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_undoing.html +998 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_unstaging.html +998 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_viewing_history.html +1172 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_web_hook.html +1059 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_what_is_introduced.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch01-getting-started.html +783 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch02-git-basics-chapter.html +816 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch03-git-branching.html +1020 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch05-distributed-git.html +859 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch06-github.html +858 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch06-github_flow.html +1502 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch10-git-internals.html +745 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch_core_editor.html +863 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/divergent_history.html +1020 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/double_dot.html +1178 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/filters_a.html +1134 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/filters_b.html +1134 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/limit_options.html +1172 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/log_options.html +1172 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_a.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_b.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_c.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_d.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_e.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_f.html +1354 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/oh_my_zsh_git.html +765 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/pretty_format.html +1172 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/psp_b.html +1667 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/rbdiag_e.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/rbdiag_g.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/rbdiag_h.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/rbdiag_i.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/rebasing-merging-example.html +1028 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ref_rerere.html +983 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ref_the_ref.html +939 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/wfdiag_b.html +859 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/wfdiag_c.html +859 -0
- data/spec/support/static/git-scm.com/book/en/v2/ch00/what_is_git_section.html +857 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/2fa-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/account-settings.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/advance-master.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/advance-testing.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/areas.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/avatar-crop.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-branching-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-branching-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-branching-3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-branching-4.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-branching-5.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-branching-6.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-merging-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-merging-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-rebase-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-rebase-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-rebase-3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/basic-rebase-4.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/benevolent-dictator.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/blink-01-start.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/blink-02-pr.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/blink-03-pull-request-open.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/blink-04-email.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/blink-04-pr-comment.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/blink-05-general-comment.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/blink-06-final.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/branch-and-history.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/branch_widget_mac.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/branch_widget_win.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/centralized.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/centralized_workflow.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/checkout-master.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/clean.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/collaborators.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/commit-and-tree.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/commits-and-parents.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/data-model-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/data-model-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/data-model-3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/data-model-4.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/deltas.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/distributed.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/double-dot.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/email-settings.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/forkbutton.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/git-bash.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/git-diff-check.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/git-fusion-boot.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/git-fusion-perforce-graph.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/git-gui.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/git-instaweb.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/git-osx-installer.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/github_mac.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/github_win.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/gitk.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/gitlab-groups.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/gitlab-menu.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/gitlab-users.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/head-to-master.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/head-to-testing.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/integration-manager.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/interesting-rebase-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/interesting-rebase-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/interesting-rebase-3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/interesting-rebase-4.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/interesting-rebase-5.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/jb.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/large-merges-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/large-merges-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/lifecycle.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/local.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/lr-branches-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/lr-branches-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/maint-01-email.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/maint-02-merge.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/maint-03-email-resp.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/maint-04-target.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/maint-05-mentions.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/maint-06-unsubscribe.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/maint-07-notifications.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/maint-08-notifications-page.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/maint-09-contrib.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/maint-10-default-branch.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/maint-11-transfer.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/managed-team-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/managed-team-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/managed-team-3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/managed-team-flow.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/markdown-01-example.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/markdown-02-tasks.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/markdown-03-task-summary.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/markdown-04-fenced-code.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/markdown-05-quote.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/markdown-06-emoji-complete.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/markdown-07-emoji.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/markdown-08-drag-drop.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/mentions-01-syntax.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/mentions-02-render.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/mentions-03-closed.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/merging-workflows-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/merging-workflows-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/merging-workflows-3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/merging-workflows-4.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/merging-workflows-5.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/new-repo.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/neworg.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/newrepo.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/newrepoform.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/orgs-01-page.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/orgs-02-teams.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/orgs-03-audit.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/p4merge.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/perils-of-rebasing-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/perils-of-rebasing-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/perils-of-rebasing-3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/perils-of-rebasing-4.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/perils-of-rebasing-5.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/posh-git.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/pr-01-fail.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/pr-02-merge-fix.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/public-small-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/public-small-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/public-small-3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/rebasing-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/rebasing-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/remote-branches-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/remote-branches-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/remote-branches-3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/remote-branches-4.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/remote-branches-5.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/replace1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/replace2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/replace3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/replace4.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/replace5.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reposettingslink.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/rerere1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/rerere2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/rerere3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-checkout.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-ex1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-ex2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-ex3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-ex4.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-ex5.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-ex6.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-hard.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-mixed.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-path1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-path2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-path3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-soft.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-squash-r1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-squash-r2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-squash-r3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-start.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/reset-workflow.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/scripting-01-services.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/scripting-02-email-service.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/scripting-03-webhook.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/scripting-04-webhook-debug.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/scripting-05-access-token.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/scripting-06-comment.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/scripting-07-status.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/signup.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/small-team-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/small-team-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/small-team-3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/small-team-4.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/small-team-5.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/small-team-6.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/small-team-7.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/small-team-flow.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/smudge.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/snapshots.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/ssh-keys.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/topic-branches-1.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/topic-branches-2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/two-branches.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/undomerge-reset.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/undomerge-revert.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/undomerge-revert2.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/undomerge-revert3.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/undomerge-start.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/your-profile.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/zsh-oh-my.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2/images/zsh-prompt.png +0 -0
- data/spec/support/static/git-scm.com/book/en/v2.html +688 -0
- data/spec/support/static/git-scm.com/favicon.ico +0 -0
- data/spec/support/static/git-scm.com/images/bg/body.jpg +0 -0
- data/spec/support/static/git-scm.com/images/bg/isometric-grid.png +0 -0
- data/spec/support/static/git-scm.com/images/bg/isometric-grid@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/bg/search-header.jpg +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/android.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/android@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/eclipse.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/eclipse@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/facebook.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/facebook@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/gnome.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/gnome@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/google.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/google@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/kde.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/kde@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/linked-in.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/linked-in@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/linux.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/linux@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/microsoft.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/microsoft@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/netflix.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/netflix@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/perl.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/perl@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/postgresql.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/postgresql@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/qt.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/qt@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/rails.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/rails@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/twitter.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/twitter@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/x.png +0 -0
- data/spec/support/static/git-scm.com/images/company-project-logos/x@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/epub.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/admin-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/admin-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/apple.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/apple@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/book.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/book@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/box.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/box@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/branch-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/branch-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/camera-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/camera-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/chevron-up@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/code.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/code@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/debugging-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/debugging-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/document.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/document@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/download.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/email-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/email-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/external-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/external-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/gui.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/gui@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/info.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/info@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/inspection-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/inspection-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/linux.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/linux@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/nav-circles.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/nav-circles@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/patching-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/patching-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/plumbing-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/plumbing-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/projects-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/projects-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/search.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/search@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/server-admin-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/server-admin-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/setup-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/setup-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/sharing-sm.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/sharing-sm@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/sidebar.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/sidebar@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/source-code.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/source-code@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/windows.png +0 -0
- data/spec/support/static/git-scm.com/images/icons/windows@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/logo@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/mobi.png +0 -0
- data/spec/support/static/git-scm.com/images/monitor-default.png +0 -0
- data/spec/support/static/git-scm.com/images/monitor-default@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/monitor-linux.png +0 -0
- data/spec/support/static/git-scm.com/images/monitor-linux@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/monitor-mac.png +0 -0
- data/spec/support/static/git-scm.com/images/monitor-mac@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/monitor-windows.png +0 -0
- data/spec/support/static/git-scm.com/images/monitor-windows@2x.png +0 -0
- data/spec/support/static/git-scm.com/images/pdf.png +0 -0
- data/spec/support/static/git-scm.com/images/progit2.png +0 -0
- data/spec/support/static/git-scm.com/images/sidebar-divider.png +0 -0
- data/spec/support/static/git-scm.com/images/sidebar-divider@2x.png +0 -0
- data/spec/support/static/git-scm.com/robots.txt +0 -0
- data/spec/task_spec.rb +7 -0
- data/wayfarer.gemspec +2 -2
- metadata +620 -16
- data/lib/wayfarer/middleware/worker.rb +0 -50
- data/spec/factories/queue/chain.rb +0 -11
- data/spec/middleware/worker_spec.rb +0 -127
|
@@ -0,0 +1,1236 @@
|
|
|
1
|
+
<!DOCTYPE html>
|
|
2
|
+
<html lang="en">
|
|
3
|
+
|
|
4
|
+
<head>
|
|
5
|
+
<!-- Global site tag (gtag.js) - Google Analytics -->
|
|
6
|
+
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-49925874-3"></script>
|
|
7
|
+
<script>
|
|
8
|
+
window.dataLayer = window.dataLayer || [];
|
|
9
|
+
function gtag(){dataLayer.push(arguments);}
|
|
10
|
+
gtag('js', new Date());
|
|
11
|
+
|
|
12
|
+
gtag('config', 'UA-49925874-3');
|
|
13
|
+
</script>
|
|
14
|
+
|
|
15
|
+
<meta charset='utf-8'>
|
|
16
|
+
<meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'>
|
|
17
|
+
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
18
|
+
<title>Git - Reset Demystified</title>
|
|
19
|
+
|
|
20
|
+
<link href='../../../../favicon.ico' rel='shortcut icon' type='image/x-icon'>
|
|
21
|
+
|
|
22
|
+
<link rel="stylesheet" media="screen" href="../../../../assets/application-cafcf280f67db0e6d8168ba98a38da878769a9d5f37793b68ffb963a02d185e0.css" />
|
|
23
|
+
<script src="../../../../assets/modernize-b3ebe0c31c24f230dc62179d3e1030d2e57a53b1668d9382c0a27dbd44a94beb.js"></script>
|
|
24
|
+
<!--[if (gte IE 6)&(lte IE 8)]>
|
|
25
|
+
<script src="/javascripts/selectivizr-min.js"></script>
|
|
26
|
+
<![endif]-->
|
|
27
|
+
|
|
28
|
+
</head>
|
|
29
|
+
|
|
30
|
+
<body id="documentation">
|
|
31
|
+
|
|
32
|
+
<div class="inner">
|
|
33
|
+
<header>
|
|
34
|
+
|
|
35
|
+
<a href="https://git-scm.com/"><img src="../../../../images/logo@2x.png" width="110" height="46" alt="Git" /></a>
|
|
36
|
+
<span id="tagline"></span>
|
|
37
|
+
<script type="text/javascript">
|
|
38
|
+
var taglines = ["fast-version-control","everything-is-local","distributed-even-if-your-workflow-isnt","local-branching-on-the-cheap","distributed-is-the-new-centralized"];
|
|
39
|
+
var tagline = taglines[Math.floor(Math.random() * taglines.length)];
|
|
40
|
+
document.getElementById('tagline').innerHTML = '--' + tagline;
|
|
41
|
+
</script>
|
|
42
|
+
<form id="search" action="https://git-scm.com/search/results">
|
|
43
|
+
<input id="search-text" name="search" placeholder="Search entire site..." autocomplete="off" type="text" />
|
|
44
|
+
</form>
|
|
45
|
+
<div id="search-results"></div>
|
|
46
|
+
|
|
47
|
+
</header>
|
|
48
|
+
|
|
49
|
+
</div> <!-- .inner -->
|
|
50
|
+
|
|
51
|
+
<div class="inner">
|
|
52
|
+
<div id="content-wrapper">
|
|
53
|
+
<button class="sidebar-btn"></button>
|
|
54
|
+
<aside class="sidebar" id="sidebar">
|
|
55
|
+
<nav>
|
|
56
|
+
<ul>
|
|
57
|
+
<li>
|
|
58
|
+
<a href="https://git-scm.com/about">About</a>
|
|
59
|
+
<ul class="">
|
|
60
|
+
<li>
|
|
61
|
+
<a href="https://git-scm.com/about">Branching and Merging</a>
|
|
62
|
+
</li>
|
|
63
|
+
<li>
|
|
64
|
+
<a href="https://git-scm.com/about/small-and-fast">Small and Fast</a>
|
|
65
|
+
</li>
|
|
66
|
+
<li>
|
|
67
|
+
<a href="https://git-scm.com/about/distributed">Distributed</a>
|
|
68
|
+
</li>
|
|
69
|
+
<li>
|
|
70
|
+
<a href="https://git-scm.com/about/info-assurance">Data Assurance</a>
|
|
71
|
+
</li>
|
|
72
|
+
<li>
|
|
73
|
+
<a href="https://git-scm.com/about/staging-area">Staging Area</a>
|
|
74
|
+
</li>
|
|
75
|
+
<li>
|
|
76
|
+
<a href="https://git-scm.com/about/free-and-open-source">Free and Open Source</a>
|
|
77
|
+
</li>
|
|
78
|
+
<li>
|
|
79
|
+
<a href="https://git-scm.com/about/trademark">Trademark</a>
|
|
80
|
+
</li>
|
|
81
|
+
</ul>
|
|
82
|
+
</li>
|
|
83
|
+
<li>
|
|
84
|
+
<a class="active" href="https://git-scm.com/doc">Documentation</a>
|
|
85
|
+
<ul class="expanded">
|
|
86
|
+
<li>
|
|
87
|
+
<a href="https://git-scm.com/docs">Reference</a>
|
|
88
|
+
</li>
|
|
89
|
+
<li>
|
|
90
|
+
<a class="active" href="https://git-scm.com/book">Book</a>
|
|
91
|
+
</li>
|
|
92
|
+
<li>
|
|
93
|
+
<a href="https://git-scm.com/videos">Videos</a>
|
|
94
|
+
</li>
|
|
95
|
+
<li>
|
|
96
|
+
<a href="https://git-scm.com/doc/ext">External Links</a>
|
|
97
|
+
</li>
|
|
98
|
+
</ul>
|
|
99
|
+
</li>
|
|
100
|
+
<li>
|
|
101
|
+
<a href="https://git-scm.com/downloads">Downloads</a>
|
|
102
|
+
<ul class="">
|
|
103
|
+
<li>
|
|
104
|
+
<a href="https://git-scm.com/downloads/guis">GUI Clients</a>
|
|
105
|
+
</li>
|
|
106
|
+
<li>
|
|
107
|
+
<a href="https://git-scm.com/downloads/logos">Logos</a>
|
|
108
|
+
</li>
|
|
109
|
+
</ul>
|
|
110
|
+
</li>
|
|
111
|
+
<li>
|
|
112
|
+
<a href="https://git-scm.com/community">Community</a>
|
|
113
|
+
</li>
|
|
114
|
+
</ul>
|
|
115
|
+
<hr class="sidebar">
|
|
116
|
+
<p>
|
|
117
|
+
This book is available in
|
|
118
|
+
<a href="https://git-scm.com/book/en">English</a>.
|
|
119
|
+
</p>
|
|
120
|
+
<p>
|
|
121
|
+
Full translation available in
|
|
122
|
+
<table>
|
|
123
|
+
<tr><td><a href="https://git-scm.com/book/az">azərbaycan dili</a>,</td></tr>
|
|
124
|
+
<tr><td><a href="https://git-scm.com/book/bg">български език</a>,</td></tr>
|
|
125
|
+
<tr><td><a href="https://git-scm.com/book/de">Deutsch</a>,</td></tr>
|
|
126
|
+
<tr><td><a href="https://git-scm.com/book/es">Español</a>,</td></tr>
|
|
127
|
+
<tr><td><a href="https://git-scm.com/book/fr">Français</a>,</td></tr>
|
|
128
|
+
<tr><td><a href="https://git-scm.com/book/gr">Ελληνικά</a>,</td></tr>
|
|
129
|
+
<tr><td><a href="https://git-scm.com/book/ja">日本語</a>,</td></tr>
|
|
130
|
+
<tr><td><a href="https://git-scm.com/book/ko">한국어</a>,</td></tr>
|
|
131
|
+
<tr><td><a href="https://git-scm.com/book/nl">Nederlands</a>,</td></tr>
|
|
132
|
+
<tr><td><a href="https://git-scm.com/book/ru">Русский</a>,</td></tr>
|
|
133
|
+
<tr><td><a href="https://git-scm.com/book/sl">Slovenščina</a>,</td></tr>
|
|
134
|
+
<tr><td><a href="https://git-scm.com/book/tl">Tagalog</a>,</td></tr>
|
|
135
|
+
<tr><td><a href="https://git-scm.com/book/uk">Українська</a></td></tr>
|
|
136
|
+
<tr><td><a href="https://git-scm.com/book/zh">简体中文</a>,</td></tr>
|
|
137
|
+
</table>
|
|
138
|
+
</p>
|
|
139
|
+
<p>
|
|
140
|
+
Partial translations available in
|
|
141
|
+
<table>
|
|
142
|
+
<tr><td><a href="https://git-scm.com/book/cs">Čeština</a>,</td></tr>
|
|
143
|
+
<tr><td><a href="https://git-scm.com/book/mk">Македонски</a>,</td></tr>
|
|
144
|
+
<tr><td><a href="https://git-scm.com/book/pl">Polski</a>,</td></tr>
|
|
145
|
+
<tr><td><a href="https://git-scm.com/book/sr">Српски</a>,</td></tr>
|
|
146
|
+
<tr><td><a href="https://git-scm.com/book/uz">Ўзбекча</a>,</td></tr>
|
|
147
|
+
<tr><td><a href="https://git-scm.com/book/zh-tw">繁體中文</a>,</td></tr>
|
|
148
|
+
</table>
|
|
149
|
+
</p>
|
|
150
|
+
<p>
|
|
151
|
+
Translations started for
|
|
152
|
+
<table>
|
|
153
|
+
<tr><td><a href="https://git-scm.com/book/be">Беларуская</a>,</td></tr>
|
|
154
|
+
<tr><td><a href="https://git-scm.com/book/fa" dir="rtl">فارسی</a>,</td></tr>
|
|
155
|
+
<tr><td><a href="https://git-scm.com/book/id">Indonesian</a>,</td></tr>
|
|
156
|
+
<tr><td><a href="https://git-scm.com/book/it">Italiano</a>,</td></tr>
|
|
157
|
+
<tr><td><a href="https://git-scm.com/book/ms">Bahasa Melayu</a>,</td></tr>
|
|
158
|
+
<tr><td><a href="https://git-scm.com/book/pt-br">Português (Brasil)</a>,</td></tr>
|
|
159
|
+
<tr><td><a href="https://git-scm.com/book/pt-pt">Português (Portugal)</a>,</td></tr>
|
|
160
|
+
<tr><td><a href="https://git-scm.com/book/sv">Svenska</a>,</td></tr>
|
|
161
|
+
<tr><td><a href="https://git-scm.com/book/tr">Türkçe</a>.</td></tr>
|
|
162
|
+
</table>
|
|
163
|
+
</p>
|
|
164
|
+
<hr class="sidebar"/>
|
|
165
|
+
<p>
|
|
166
|
+
The source of this book is <a href="https://github.com/progit/progit2">hosted on GitHub.</a></br>
|
|
167
|
+
Patches, suggestions and comments are welcome.
|
|
168
|
+
</p>
|
|
169
|
+
|
|
170
|
+
|
|
171
|
+
</nav>
|
|
172
|
+
</aside>
|
|
173
|
+
|
|
174
|
+
<div id="content">
|
|
175
|
+
|
|
176
|
+
|
|
177
|
+
<div id='book-chapters'>
|
|
178
|
+
<a class="dropdown-trigger" id="book-chapters-trigger" data-panel-id="chapters-dropdown" href="_the_index.html#">Chapters ▾</a>
|
|
179
|
+
<div class='dropdown-panel' id='chapters-dropdown'>
|
|
180
|
+
<div class="three-column">
|
|
181
|
+
<div class='column-left'>
|
|
182
|
+
<ol class='book-toc'>
|
|
183
|
+
<li class='chapter'>
|
|
184
|
+
<h2>1. <a href="ch01-getting-started.html">Getting Started</a></h2>
|
|
185
|
+
<ol>
|
|
186
|
+
<li>
|
|
187
|
+
1.1
|
|
188
|
+
<a href="ch01-getting-started.html" >About Version Control </a>
|
|
189
|
+
</li>
|
|
190
|
+
<li>
|
|
191
|
+
1.2
|
|
192
|
+
<a href="../Getting-Started-A-Short-History-of-Git.html" >A Short History of Git </a>
|
|
193
|
+
</li>
|
|
194
|
+
<li>
|
|
195
|
+
1.3
|
|
196
|
+
<a href="what_is_git_section.html" >What is Git? </a>
|
|
197
|
+
</li>
|
|
198
|
+
<li>
|
|
199
|
+
1.4
|
|
200
|
+
<a href="../Getting-Started-The-Command-Line.html" >The Command Line </a>
|
|
201
|
+
</li>
|
|
202
|
+
<li>
|
|
203
|
+
1.5
|
|
204
|
+
<a href="../Getting-Started-Installing-Git.html" >Installing Git </a>
|
|
205
|
+
</li>
|
|
206
|
+
<li>
|
|
207
|
+
1.6
|
|
208
|
+
<a href="_editor.html" >First-Time Git Setup </a>
|
|
209
|
+
</li>
|
|
210
|
+
<li>
|
|
211
|
+
1.7
|
|
212
|
+
<a href="_git_help.html" >Getting Help </a>
|
|
213
|
+
</li>
|
|
214
|
+
<li>
|
|
215
|
+
1.8
|
|
216
|
+
<a href="../Getting-Started-Summary.html" >Summary </a>
|
|
217
|
+
</li>
|
|
218
|
+
</ol>
|
|
219
|
+
</li>
|
|
220
|
+
<li class='chapter'>
|
|
221
|
+
<h2>2. <a href="_git_cloning.html">Git Basics</a></h2>
|
|
222
|
+
<ol>
|
|
223
|
+
<li>
|
|
224
|
+
2.1
|
|
225
|
+
<a href="_git_cloning.html" >Getting a Git Repository </a>
|
|
226
|
+
</li>
|
|
227
|
+
<li>
|
|
228
|
+
2.2
|
|
229
|
+
<a href="_git_mv.html" >Recording Changes to the Repository </a>
|
|
230
|
+
</li>
|
|
231
|
+
<li>
|
|
232
|
+
2.3
|
|
233
|
+
<a href="_viewing_history.html" >Viewing the Commit History </a>
|
|
234
|
+
</li>
|
|
235
|
+
<li>
|
|
236
|
+
2.4
|
|
237
|
+
<a href="_unstaging.html" >Undoing Things </a>
|
|
238
|
+
</li>
|
|
239
|
+
<li>
|
|
240
|
+
2.5
|
|
241
|
+
<a href="_remote_repos.html" >Working with Remotes </a>
|
|
242
|
+
</li>
|
|
243
|
+
<li>
|
|
244
|
+
2.6
|
|
245
|
+
<a href="_annotated_tags.html" >Tagging </a>
|
|
246
|
+
</li>
|
|
247
|
+
<li>
|
|
248
|
+
2.7
|
|
249
|
+
<a href="_git_aliases.html" >Git Aliases </a>
|
|
250
|
+
</li>
|
|
251
|
+
<li>
|
|
252
|
+
2.8
|
|
253
|
+
<a href="../Git-Basics-Summary.html" >Summary </a>
|
|
254
|
+
</li>
|
|
255
|
+
</ol>
|
|
256
|
+
</li>
|
|
257
|
+
<li class='chapter'>
|
|
258
|
+
<h2>3. <a href="_switching_branches.html">Git Branching</a></h2>
|
|
259
|
+
<ol>
|
|
260
|
+
<li>
|
|
261
|
+
3.1
|
|
262
|
+
<a href="_switching_branches.html" >Branches in a Nutshell </a>
|
|
263
|
+
</li>
|
|
264
|
+
<li>
|
|
265
|
+
3.2
|
|
266
|
+
<a href="_basic_branching.html" >Basic Branching and Merging </a>
|
|
267
|
+
</li>
|
|
268
|
+
<li>
|
|
269
|
+
3.3
|
|
270
|
+
<a href="_branch_management.html" >Branch Management </a>
|
|
271
|
+
</li>
|
|
272
|
+
<li>
|
|
273
|
+
3.4
|
|
274
|
+
<a href="_topic_branch.html" >Branching Workflows </a>
|
|
275
|
+
</li>
|
|
276
|
+
<li>
|
|
277
|
+
3.5
|
|
278
|
+
<a href="_delete_branches.html" >Remote Branches </a>
|
|
279
|
+
</li>
|
|
280
|
+
<li>
|
|
281
|
+
3.6
|
|
282
|
+
<a href="_rebase_rebase.html" >Rebasing </a>
|
|
283
|
+
</li>
|
|
284
|
+
<li>
|
|
285
|
+
3.7
|
|
286
|
+
<a href="../Git-Branching-Summary.html" >Summary </a>
|
|
287
|
+
</li>
|
|
288
|
+
</ol>
|
|
289
|
+
</li>
|
|
290
|
+
<li class='chapter'>
|
|
291
|
+
<h2>4. <a href="../Git-on-the-Server-The-Protocols.html">Git on the Server</a></h2>
|
|
292
|
+
<ol>
|
|
293
|
+
<li>
|
|
294
|
+
4.1
|
|
295
|
+
<a href="../Git-on-the-Server-The-Protocols.html" >The Protocols </a>
|
|
296
|
+
</li>
|
|
297
|
+
<li>
|
|
298
|
+
4.2
|
|
299
|
+
<a href="_bare_repo.html" >Getting Git on a Server </a>
|
|
300
|
+
</li>
|
|
301
|
+
<li>
|
|
302
|
+
4.3
|
|
303
|
+
<a href="_generate_ssh_key.html" >Generating Your SSH Public Key </a>
|
|
304
|
+
</li>
|
|
305
|
+
<li>
|
|
306
|
+
4.4
|
|
307
|
+
<a href="_setting_up_server.html" >Setting Up the Server </a>
|
|
308
|
+
</li>
|
|
309
|
+
<li>
|
|
310
|
+
4.5
|
|
311
|
+
<a href="../Git-on-the-Server-Git-Daemon.html" >Git Daemon </a>
|
|
312
|
+
</li>
|
|
313
|
+
<li>
|
|
314
|
+
4.6
|
|
315
|
+
<a href="../Git-on-the-Server-Smart-HTTP.html" >Smart HTTP </a>
|
|
316
|
+
</li>
|
|
317
|
+
<li>
|
|
318
|
+
4.7
|
|
319
|
+
<a href="../Git-on-the-Server-GitWeb.html" >GitWeb </a>
|
|
320
|
+
</li>
|
|
321
|
+
<li>
|
|
322
|
+
4.8
|
|
323
|
+
<a href="_gitlab_groups_section.html" >GitLab </a>
|
|
324
|
+
</li>
|
|
325
|
+
<li>
|
|
326
|
+
4.9
|
|
327
|
+
<a href="../Git-on-the-Server-Third-Party-Hosted-Options.html" >Third Party Hosted Options </a>
|
|
328
|
+
</li>
|
|
329
|
+
<li>
|
|
330
|
+
4.10
|
|
331
|
+
<a href="../Git-on-the-Server-Summary.html" >Summary </a>
|
|
332
|
+
</li>
|
|
333
|
+
</ol>
|
|
334
|
+
</li>
|
|
335
|
+
<li class='chapter'>
|
|
336
|
+
<h2>5. <a href="_integration_manager.html">Distributed Git</a></h2>
|
|
337
|
+
<ol>
|
|
338
|
+
<li>
|
|
339
|
+
5.1
|
|
340
|
+
<a href="_integration_manager.html" >Distributed Workflows </a>
|
|
341
|
+
</li>
|
|
342
|
+
<li>
|
|
343
|
+
5.2
|
|
344
|
+
<a href="_project_over_email.html" >Contributing to a Project </a>
|
|
345
|
+
</li>
|
|
346
|
+
<li>
|
|
347
|
+
5.3
|
|
348
|
+
<a href="_git_am.html" >Maintaining a Project </a>
|
|
349
|
+
</li>
|
|
350
|
+
<li>
|
|
351
|
+
5.4
|
|
352
|
+
<a href="../Distributed-Git-Summary.html" >Summary </a>
|
|
353
|
+
</li>
|
|
354
|
+
</ol>
|
|
355
|
+
</li>
|
|
356
|
+
</ol>
|
|
357
|
+
|
|
358
|
+
</div>
|
|
359
|
+
<div class='column-middle'>
|
|
360
|
+
<ol class='book-toc'>
|
|
361
|
+
<li class='chapter'>
|
|
362
|
+
<h2>6. <a href="_personal_avatar.html">GitHub</a></h2>
|
|
363
|
+
<ol>
|
|
364
|
+
<li>
|
|
365
|
+
6.1
|
|
366
|
+
<a href="_personal_avatar.html" >Account Setup and Configuration </a>
|
|
367
|
+
</li>
|
|
368
|
+
<li>
|
|
369
|
+
6.2
|
|
370
|
+
<a href="_fetch_and_push_on_different_repositories.html" >Contributing to a Project </a>
|
|
371
|
+
</li>
|
|
372
|
+
<li>
|
|
373
|
+
6.3
|
|
374
|
+
<a href="_email_notifications.html" >Maintaining a Project </a>
|
|
375
|
+
</li>
|
|
376
|
+
<li>
|
|
377
|
+
6.4
|
|
378
|
+
<a href="_team_page.html" >Managing an organization </a>
|
|
379
|
+
</li>
|
|
380
|
+
<li>
|
|
381
|
+
6.5
|
|
382
|
+
<a href="_commit_status.html" >Scripting GitHub </a>
|
|
383
|
+
</li>
|
|
384
|
+
<li>
|
|
385
|
+
6.6
|
|
386
|
+
<a href="../GitHub-Summary.html" >Summary </a>
|
|
387
|
+
</li>
|
|
388
|
+
</ol>
|
|
389
|
+
</li>
|
|
390
|
+
<li class='chapter'>
|
|
391
|
+
<h2>7. <a href="_git_reflog.html">Git Tools</a></h2>
|
|
392
|
+
<ol>
|
|
393
|
+
<li>
|
|
394
|
+
7.1
|
|
395
|
+
<a href="_git_reflog.html" >Revision Selection </a>
|
|
396
|
+
</li>
|
|
397
|
+
<li>
|
|
398
|
+
7.2
|
|
399
|
+
<a href="_interactive_staging.html" >Interactive Staging </a>
|
|
400
|
+
</li>
|
|
401
|
+
<li>
|
|
402
|
+
7.3
|
|
403
|
+
<a href="_git_clean.html" >Stashing and Cleaning </a>
|
|
404
|
+
</li>
|
|
405
|
+
<li>
|
|
406
|
+
7.4
|
|
407
|
+
<a href="_signing_commits.html" >Signing Your Work </a>
|
|
408
|
+
</li>
|
|
409
|
+
<li>
|
|
410
|
+
7.5
|
|
411
|
+
<a href="_git_grep.html" >Searching </a>
|
|
412
|
+
</li>
|
|
413
|
+
<li>
|
|
414
|
+
7.6
|
|
415
|
+
<a href="_removing_file_every_commit.html" >Rewriting History </a>
|
|
416
|
+
</li>
|
|
417
|
+
<li>
|
|
418
|
+
7.7
|
|
419
|
+
<a href="_the_index.html" class=active>Reset Demystified </a>
|
|
420
|
+
</li>
|
|
421
|
+
<li>
|
|
422
|
+
7.8
|
|
423
|
+
<a href="_reverse_commit.html" >Advanced Merging </a>
|
|
424
|
+
</li>
|
|
425
|
+
<li>
|
|
426
|
+
7.9
|
|
427
|
+
<a href="ref_rerere.html" >Rerere </a>
|
|
428
|
+
</li>
|
|
429
|
+
<li>
|
|
430
|
+
7.10
|
|
431
|
+
<a href="_file_annotation.html" >Debugging with Git </a>
|
|
432
|
+
</li>
|
|
433
|
+
<li>
|
|
434
|
+
7.11
|
|
435
|
+
<a href="_publishing_submodules.html" >Submodules </a>
|
|
436
|
+
</li>
|
|
437
|
+
<li>
|
|
438
|
+
7.12
|
|
439
|
+
<a href="_bundling.html" >Bundling </a>
|
|
440
|
+
</li>
|
|
441
|
+
<li>
|
|
442
|
+
7.13
|
|
443
|
+
<a href="_replace.html" >Replace </a>
|
|
444
|
+
</li>
|
|
445
|
+
<li>
|
|
446
|
+
7.14
|
|
447
|
+
<a href="_credential_caching.html" >Credential Storage </a>
|
|
448
|
+
</li>
|
|
449
|
+
<li>
|
|
450
|
+
7.15
|
|
451
|
+
<a href="../Git-Tools-Summary.html" >Summary </a>
|
|
452
|
+
</li>
|
|
453
|
+
</ol>
|
|
454
|
+
</li>
|
|
455
|
+
<li class='chapter'>
|
|
456
|
+
<h2>8. <a href="_external_merge_tools.html">Customizing Git</a></h2>
|
|
457
|
+
<ol>
|
|
458
|
+
<li>
|
|
459
|
+
8.1
|
|
460
|
+
<a href="_external_merge_tools.html" >Git Configuration </a>
|
|
461
|
+
</li>
|
|
462
|
+
<li>
|
|
463
|
+
8.2
|
|
464
|
+
<a href="_keyword_expansion.html" >Git Attributes </a>
|
|
465
|
+
</li>
|
|
466
|
+
<li>
|
|
467
|
+
8.3
|
|
468
|
+
<a href="_email_hooks.html" >Git Hooks </a>
|
|
469
|
+
</li>
|
|
470
|
+
<li>
|
|
471
|
+
8.4
|
|
472
|
+
<a href="_enforcing_commit_message_format.html" >An Example Git-Enforced Policy </a>
|
|
473
|
+
</li>
|
|
474
|
+
<li>
|
|
475
|
+
8.5
|
|
476
|
+
<a href="../Customizing-Git-Summary.html" >Summary </a>
|
|
477
|
+
</li>
|
|
478
|
+
</ol>
|
|
479
|
+
</li>
|
|
480
|
+
<li class='chapter'>
|
|
481
|
+
<h2>9. <a href="_git_svn.html">Git and Other Systems</a></h2>
|
|
482
|
+
<ol>
|
|
483
|
+
<li>
|
|
484
|
+
9.1
|
|
485
|
+
<a href="_git_svn.html" >Git as a Client </a>
|
|
486
|
+
</li>
|
|
487
|
+
<li>
|
|
488
|
+
9.2
|
|
489
|
+
<a href="_git_p4.html" >Migrating to Git </a>
|
|
490
|
+
</li>
|
|
491
|
+
<li>
|
|
492
|
+
9.3
|
|
493
|
+
<a href="../Git-and-Other-Systems-Summary.html" >Summary </a>
|
|
494
|
+
</li>
|
|
495
|
+
</ol>
|
|
496
|
+
</li>
|
|
497
|
+
<li class='chapter'>
|
|
498
|
+
<h2>10. <a href="_plumbing_porcelain.html">Git Internals</a></h2>
|
|
499
|
+
<ol>
|
|
500
|
+
<li>
|
|
501
|
+
10.1
|
|
502
|
+
<a href="_plumbing_porcelain.html" >Plumbing and Porcelain </a>
|
|
503
|
+
</li>
|
|
504
|
+
<li>
|
|
505
|
+
10.2
|
|
506
|
+
<a href="_git_commit_objects.html" >Git Objects </a>
|
|
507
|
+
</li>
|
|
508
|
+
<li>
|
|
509
|
+
10.3
|
|
510
|
+
<a href="ref_the_ref.html" >Git References </a>
|
|
511
|
+
</li>
|
|
512
|
+
<li>
|
|
513
|
+
10.4
|
|
514
|
+
<a href="../Git-Internals-Packfiles.html" >Packfiles </a>
|
|
515
|
+
</li>
|
|
516
|
+
<li>
|
|
517
|
+
10.5
|
|
518
|
+
<a href="_pushing_refspecs.html" >The Refspec </a>
|
|
519
|
+
</li>
|
|
520
|
+
<li>
|
|
521
|
+
10.6
|
|
522
|
+
<a href="../Git-Internals-Transfer-Protocols.html" >Transfer Protocols </a>
|
|
523
|
+
</li>
|
|
524
|
+
<li>
|
|
525
|
+
10.7
|
|
526
|
+
<a href="_git_gc.html" >Maintenance and Data Recovery </a>
|
|
527
|
+
</li>
|
|
528
|
+
<li>
|
|
529
|
+
10.8
|
|
530
|
+
<a href="../Git-Internals-Environment-Variables.html" >Environment Variables </a>
|
|
531
|
+
</li>
|
|
532
|
+
<li>
|
|
533
|
+
10.9
|
|
534
|
+
<a href="../Git-Internals-Summary.html" >Summary </a>
|
|
535
|
+
</li>
|
|
536
|
+
</ol>
|
|
537
|
+
</li>
|
|
538
|
+
</ol>
|
|
539
|
+
|
|
540
|
+
</div>
|
|
541
|
+
<div class='column-right'>
|
|
542
|
+
<ol class='book-toc'>
|
|
543
|
+
<li class='chapter'>
|
|
544
|
+
<h2>A1. <a href="../Appendix-A:-Git-in-Other-Environments-Graphical-Interfaces.html">Appendix A: Git in Other Environments</a></h2>
|
|
545
|
+
<ol>
|
|
546
|
+
<li>
|
|
547
|
+
A1.1
|
|
548
|
+
<a href="../Appendix-A:-Git-in-Other-Environments-Graphical-Interfaces.html" >Graphical Interfaces </a>
|
|
549
|
+
</li>
|
|
550
|
+
<li>
|
|
551
|
+
A1.2
|
|
552
|
+
<a href="../Appendix-A:-Git-in-Other-Environments-Git-in-Visual-Studio.html" >Git in Visual Studio </a>
|
|
553
|
+
</li>
|
|
554
|
+
<li>
|
|
555
|
+
A1.3
|
|
556
|
+
<a href="../Appendix-A:-Git-in-Other-Environments-Git-in-Visual-Studio-Code.html" >Git in Visual Studio Code </a>
|
|
557
|
+
</li>
|
|
558
|
+
<li>
|
|
559
|
+
A1.4
|
|
560
|
+
<a href="../Appendix-A:-Git-in-Other-Environments-Git-in-IntelliJ-%252F-PyCharm-%252F-WebStorm-%252F-PhpStorm-%252F-RubyMine.html" >Git in IntelliJ / PyCharm / WebStorm / PhpStorm / RubyMine </a>
|
|
561
|
+
</li>
|
|
562
|
+
<li>
|
|
563
|
+
A1.5
|
|
564
|
+
<a href="../Appendix-A:-Git-in-Other-Environments-Git-in-Sublime-Text.html" >Git in Sublime Text </a>
|
|
565
|
+
</li>
|
|
566
|
+
<li>
|
|
567
|
+
A1.6
|
|
568
|
+
<a href="../Appendix-A:-Git-in-Other-Environments-Git-in-Bash.html" >Git in Bash </a>
|
|
569
|
+
</li>
|
|
570
|
+
<li>
|
|
571
|
+
A1.7
|
|
572
|
+
<a href="oh_my_zsh_git.html" >Git in Zsh </a>
|
|
573
|
+
</li>
|
|
574
|
+
<li>
|
|
575
|
+
A1.8
|
|
576
|
+
<a href="../Appendix-A:-Git-in-Other-Environments-Git-in-PowerShell.html" >Git in PowerShell </a>
|
|
577
|
+
</li>
|
|
578
|
+
<li>
|
|
579
|
+
A1.9
|
|
580
|
+
<a href="../Appendix-A:-Git-in-Other-Environments-Summary.html" >Summary </a>
|
|
581
|
+
</li>
|
|
582
|
+
</ol>
|
|
583
|
+
</li>
|
|
584
|
+
<li class='chapter'>
|
|
585
|
+
<h2>A2. <a href="../Appendix-B:-Embedding-Git-in-your-Applications-Command-line-Git.html">Appendix B: Embedding Git in your Applications</a></h2>
|
|
586
|
+
<ol>
|
|
587
|
+
<li>
|
|
588
|
+
A2.1
|
|
589
|
+
<a href="../Appendix-B:-Embedding-Git-in-your-Applications-Command-line-Git.html" >Command-line Git </a>
|
|
590
|
+
</li>
|
|
591
|
+
<li>
|
|
592
|
+
A2.2
|
|
593
|
+
<a href="_libgit2_bindings.html" >Libgit2 </a>
|
|
594
|
+
</li>
|
|
595
|
+
<li>
|
|
596
|
+
A2.3
|
|
597
|
+
<a href="../Appendix-B:-Embedding-Git-in-your-Applications-JGit.html" >JGit </a>
|
|
598
|
+
</li>
|
|
599
|
+
<li>
|
|
600
|
+
A2.4
|
|
601
|
+
<a href="../Appendix-B:-Embedding-Git-in-your-Applications-go-git.html" >go-git </a>
|
|
602
|
+
</li>
|
|
603
|
+
<li>
|
|
604
|
+
A2.5
|
|
605
|
+
<a href="../Appendix-B:-Embedding-Git-in-your-Applications-Dulwich.html" >Dulwich </a>
|
|
606
|
+
</li>
|
|
607
|
+
</ol>
|
|
608
|
+
</li>
|
|
609
|
+
<li class='chapter'>
|
|
610
|
+
<h2>A3. <a href="ch_core_editor.html">Appendix C: Git Commands</a></h2>
|
|
611
|
+
<ol>
|
|
612
|
+
<li>
|
|
613
|
+
A3.1
|
|
614
|
+
<a href="ch_core_editor.html" >Setup and Config </a>
|
|
615
|
+
</li>
|
|
616
|
+
<li>
|
|
617
|
+
A3.2
|
|
618
|
+
<a href="../Appendix-C:-Git-Commands-Getting-and-Creating-Projects.html" >Getting and Creating Projects </a>
|
|
619
|
+
</li>
|
|
620
|
+
<li>
|
|
621
|
+
A3.3
|
|
622
|
+
<a href="../Appendix-C:-Git-Commands-Basic-Snapshotting.html" >Basic Snapshotting </a>
|
|
623
|
+
</li>
|
|
624
|
+
<li>
|
|
625
|
+
A3.4
|
|
626
|
+
<a href="../Appendix-C:-Git-Commands-Branching-and-Merging.html" >Branching and Merging </a>
|
|
627
|
+
</li>
|
|
628
|
+
<li>
|
|
629
|
+
A3.5
|
|
630
|
+
<a href="../Appendix-C:-Git-Commands-Sharing-and-Updating-Projects.html" >Sharing and Updating Projects </a>
|
|
631
|
+
</li>
|
|
632
|
+
<li>
|
|
633
|
+
A3.6
|
|
634
|
+
<a href="../Appendix-C:-Git-Commands-Inspection-and-Comparison.html" >Inspection and Comparison </a>
|
|
635
|
+
</li>
|
|
636
|
+
<li>
|
|
637
|
+
A3.7
|
|
638
|
+
<a href="../Appendix-C:-Git-Commands-Debugging.html" >Debugging </a>
|
|
639
|
+
</li>
|
|
640
|
+
<li>
|
|
641
|
+
A3.8
|
|
642
|
+
<a href="../Appendix-C:-Git-Commands-Patching.html" >Patching </a>
|
|
643
|
+
</li>
|
|
644
|
+
<li>
|
|
645
|
+
A3.9
|
|
646
|
+
<a href="../Appendix-C:-Git-Commands-Email.html" >Email </a>
|
|
647
|
+
</li>
|
|
648
|
+
<li>
|
|
649
|
+
A3.10
|
|
650
|
+
<a href="../Appendix-C:-Git-Commands-External-Systems.html" >External Systems </a>
|
|
651
|
+
</li>
|
|
652
|
+
<li>
|
|
653
|
+
A3.11
|
|
654
|
+
<a href="../Appendix-C:-Git-Commands-Administration.html" >Administration </a>
|
|
655
|
+
</li>
|
|
656
|
+
<li>
|
|
657
|
+
A3.12
|
|
658
|
+
<a href="../Appendix-C:-Git-Commands-Plumbing-Commands.html" >Plumbing Commands </a>
|
|
659
|
+
</li>
|
|
660
|
+
</ol>
|
|
661
|
+
</li>
|
|
662
|
+
</ol>
|
|
663
|
+
|
|
664
|
+
</div>
|
|
665
|
+
</div>
|
|
666
|
+
</div>
|
|
667
|
+
|
|
668
|
+
<span class="light" id="edition">
|
|
669
|
+
2nd Edition
|
|
670
|
+
</span>
|
|
671
|
+
</div>
|
|
672
|
+
|
|
673
|
+
<div id='main' class="book edition2">
|
|
674
|
+
<h1>7.7 Git Tools - Reset Demystified</h1>
|
|
675
|
+
<div>
|
|
676
|
+
<h2 id="_git_reset">Reset Demystified</h2>
|
|
677
|
+
<div class="paragraph">
|
|
678
|
+
<p>Before moving on to more specialized tools, let’s talk about the Git <code>reset</code> and <code>checkout</code> commands.
|
|
679
|
+
These commands are two of the most confusing parts of Git when you first encounter them.
|
|
680
|
+
They do so many things that it seems hopeless to actually understand them and employ them properly.
|
|
681
|
+
For this, we recommend a simple metaphor.</p>
|
|
682
|
+
</div>
|
|
683
|
+
<div class="sect3">
|
|
684
|
+
<h3 id="_the_three_trees">The Three Trees</h3>
|
|
685
|
+
<div class="paragraph">
|
|
686
|
+
<p>An easier way to think about <code>reset</code> and <code>checkout</code> is through the mental frame of Git being a content manager of three different trees.
|
|
687
|
+
By “tree” here, we really mean “collection of files”, not specifically the data structure.
|
|
688
|
+
There are a few cases where the index doesn’t exactly act like a tree, but for our purposes it is easier to think about it this way for now.</p>
|
|
689
|
+
</div>
|
|
690
|
+
<div class="paragraph">
|
|
691
|
+
<p>Git as a system manages and manipulates three trees in its normal operation:</p>
|
|
692
|
+
</div>
|
|
693
|
+
<table class="tableblock frame-all grid-all stretch">
|
|
694
|
+
<colgroup>
|
|
695
|
+
<col style="width: 33.3333%;">
|
|
696
|
+
<col style="width: 66.6667%;">
|
|
697
|
+
</colgroup>
|
|
698
|
+
<thead>
|
|
699
|
+
<tr>
|
|
700
|
+
<th class="tableblock halign-left valign-top">Tree</th>
|
|
701
|
+
<th class="tableblock halign-left valign-top">Role</th>
|
|
702
|
+
</tr>
|
|
703
|
+
</thead>
|
|
704
|
+
<tbody>
|
|
705
|
+
<tr>
|
|
706
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">HEAD</p></td>
|
|
707
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">Last commit snapshot, next parent</p></td>
|
|
708
|
+
</tr>
|
|
709
|
+
<tr>
|
|
710
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">Index</p></td>
|
|
711
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">Proposed next commit snapshot</p></td>
|
|
712
|
+
</tr>
|
|
713
|
+
<tr>
|
|
714
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">Working Directory</p></td>
|
|
715
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">Sandbox</p></td>
|
|
716
|
+
</tr>
|
|
717
|
+
</tbody>
|
|
718
|
+
</table>
|
|
719
|
+
<div class="sect4">
|
|
720
|
+
<h4 id="_the_head">The HEAD</h4>
|
|
721
|
+
<div class="paragraph">
|
|
722
|
+
<p>HEAD is the pointer to the current branch reference, which is in turn a pointer to the last commit made on that branch.
|
|
723
|
+
That means HEAD will be the parent of the next commit that is created.
|
|
724
|
+
It’s generally simplest to think of HEAD as the snapshot of <strong>your last commit on that branch</strong>.</p>
|
|
725
|
+
</div>
|
|
726
|
+
<div class="paragraph">
|
|
727
|
+
<p>In fact, it’s pretty easy to see what that snapshot looks like.
|
|
728
|
+
Here is an example of getting the actual directory listing and SHA-1 checksums for each file in the HEAD snapshot:</p>
|
|
729
|
+
</div>
|
|
730
|
+
<div class="listingblock">
|
|
731
|
+
<div class="content">
|
|
732
|
+
<pre class="highlight"><code class="language-console" data-lang="console">$ git cat-file -p HEAD
|
|
733
|
+
tree cfda3bf379e4f8dba8717dee55aab78aef7f4daf
|
|
734
|
+
author Scott Chacon 1301511835 -0700
|
|
735
|
+
committer Scott Chacon 1301511835 -0700
|
|
736
|
+
|
|
737
|
+
initial commit
|
|
738
|
+
|
|
739
|
+
$ git ls-tree -r HEAD
|
|
740
|
+
100644 blob a906cb2a4a904a152... README
|
|
741
|
+
100644 blob 8f94139338f9404f2... Rakefile
|
|
742
|
+
040000 tree 99f1a6d12cb4b6f19... lib</code></pre>
|
|
743
|
+
</div>
|
|
744
|
+
</div>
|
|
745
|
+
<div class="paragraph">
|
|
746
|
+
<p>The Git <code>cat-file</code> and <code>ls-tree</code> commands are “plumbing” commands that are used for lower level things and not really used in day-to-day work, but they help us see what’s going on here.</p>
|
|
747
|
+
</div>
|
|
748
|
+
</div>
|
|
749
|
+
<div class="sect4">
|
|
750
|
+
<h4 id="_the_index">The Index</h4>
|
|
751
|
+
<div class="paragraph">
|
|
752
|
+
<p>The <em>index</em> is your <strong>proposed next commit</strong>.
|
|
753
|
+
We’ve also been referring to this concept as Git’s “Staging Area” as this is what Git looks at when you run <code>git commit</code>.</p>
|
|
754
|
+
</div>
|
|
755
|
+
<div class="paragraph">
|
|
756
|
+
<p>Git populates this index with a list of all the file contents that were last checked out into your working directory and what they looked like when they were originally checked out.
|
|
757
|
+
You then replace some of those files with new versions of them, and <code>git commit</code> converts that into the tree for a new commit.</p>
|
|
758
|
+
</div>
|
|
759
|
+
<div class="listingblock">
|
|
760
|
+
<div class="content">
|
|
761
|
+
<pre class="highlight"><code class="language-console" data-lang="console">$ git ls-files -s
|
|
762
|
+
100644 a906cb2a4a904a152e80877d4088654daad0c859 0 README
|
|
763
|
+
100644 8f94139338f9404f26296befa88755fc2598c289 0 Rakefile
|
|
764
|
+
100644 47c6340d6459e05787f644c2447d2595f5d3a54b 0 lib/simplegit.rb</code></pre>
|
|
765
|
+
</div>
|
|
766
|
+
</div>
|
|
767
|
+
<div class="paragraph">
|
|
768
|
+
<p>Again, here we’re using <code>git ls-files</code>, which is more of a behind the scenes command that shows you what your index currently looks like.</p>
|
|
769
|
+
</div>
|
|
770
|
+
<div class="paragraph">
|
|
771
|
+
<p>The index is not technically a tree structure — it’s actually implemented as a flattened manifest — but for our purposes it’s close enough.</p>
|
|
772
|
+
</div>
|
|
773
|
+
</div>
|
|
774
|
+
<div class="sect4">
|
|
775
|
+
<h4 id="_the_working_directory">The Working Directory</h4>
|
|
776
|
+
<div class="paragraph">
|
|
777
|
+
<p>Finally, you have your <em>working directory</em> (also commonly referred to as the “working tree”).
|
|
778
|
+
The other two trees store their content in an efficient but inconvenient manner, inside the <code>.git</code> folder.
|
|
779
|
+
The working directory unpacks them into actual files, which makes it much easier for you to edit them.
|
|
780
|
+
Think of the working directory as a <strong>sandbox</strong>, where you can try changes out before committing them to your staging area (index) and then to history.</p>
|
|
781
|
+
</div>
|
|
782
|
+
<div class="listingblock">
|
|
783
|
+
<div class="content">
|
|
784
|
+
<pre class="highlight"><code class="language-console" data-lang="console">$ tree
|
|
785
|
+
.
|
|
786
|
+
├── README
|
|
787
|
+
├── Rakefile
|
|
788
|
+
└── lib
|
|
789
|
+
└── simplegit.rb
|
|
790
|
+
|
|
791
|
+
1 directory, 3 files</code></pre>
|
|
792
|
+
</div>
|
|
793
|
+
</div>
|
|
794
|
+
</div>
|
|
795
|
+
</div>
|
|
796
|
+
<div class="sect3">
|
|
797
|
+
<h3 id="_the_workflow">The Workflow</h3>
|
|
798
|
+
<div class="paragraph">
|
|
799
|
+
<p>Git’s typical workflow is to record snapshots of your project in successively better states, by manipulating these three trees.</p>
|
|
800
|
+
</div>
|
|
801
|
+
<div class="imageblock">
|
|
802
|
+
<div class="content">
|
|
803
|
+
<img src="../images/reset-workflow.png" alt="reset workflow">
|
|
804
|
+
</div>
|
|
805
|
+
</div>
|
|
806
|
+
<div class="paragraph">
|
|
807
|
+
<p>Let’s visualize this process: say you go into a new directory with a single file in it.
|
|
808
|
+
We’ll call this <strong>v1</strong> of the file, and we’ll indicate it in blue.
|
|
809
|
+
Now we run <code>git init</code>, which will create a Git repository with a HEAD reference which points to the unborn <code>master</code> branch.</p>
|
|
810
|
+
</div>
|
|
811
|
+
<div class="imageblock">
|
|
812
|
+
<div class="content">
|
|
813
|
+
<img src="../images/reset-ex1.png" alt="reset ex1">
|
|
814
|
+
</div>
|
|
815
|
+
</div>
|
|
816
|
+
<div class="paragraph">
|
|
817
|
+
<p>At this point, only the working directory tree has any content.</p>
|
|
818
|
+
</div>
|
|
819
|
+
<div class="paragraph">
|
|
820
|
+
<p>Now we want to commit this file, so we use <code>git add</code> to take content in the working directory and copy it to the index.</p>
|
|
821
|
+
</div>
|
|
822
|
+
<div class="imageblock">
|
|
823
|
+
<div class="content">
|
|
824
|
+
<img src="../images/reset-ex2.png" alt="reset ex2">
|
|
825
|
+
</div>
|
|
826
|
+
</div>
|
|
827
|
+
<div class="paragraph">
|
|
828
|
+
<p>Then we run <code>git commit</code>, which takes the contents of the index and saves it as a permanent snapshot, creates a commit object which points to that snapshot, and updates <code>master</code> to point to that commit.</p>
|
|
829
|
+
</div>
|
|
830
|
+
<div class="imageblock">
|
|
831
|
+
<div class="content">
|
|
832
|
+
<img src="../images/reset-ex3.png" alt="reset ex3">
|
|
833
|
+
</div>
|
|
834
|
+
</div>
|
|
835
|
+
<div class="paragraph">
|
|
836
|
+
<p>If we run <code>git status</code>, we’ll see no changes, because all three trees are the same.</p>
|
|
837
|
+
</div>
|
|
838
|
+
<div class="paragraph">
|
|
839
|
+
<p>Now we want to make a change to that file and commit it.
|
|
840
|
+
We’ll go through the same process; first, we change the file in our working directory.
|
|
841
|
+
Let’s call this <strong>v2</strong> of the file, and indicate it in red.</p>
|
|
842
|
+
</div>
|
|
843
|
+
<div class="imageblock">
|
|
844
|
+
<div class="content">
|
|
845
|
+
<img src="../images/reset-ex4.png" alt="reset ex4">
|
|
846
|
+
</div>
|
|
847
|
+
</div>
|
|
848
|
+
<div class="paragraph">
|
|
849
|
+
<p>If we run <code>git status</code> right now, we’ll see the file in red as “Changes not staged for commit”, because that entry differs between the index and the working directory.
|
|
850
|
+
Next we run <code>git add</code> on it to stage it into our index.</p>
|
|
851
|
+
</div>
|
|
852
|
+
<div class="imageblock">
|
|
853
|
+
<div class="content">
|
|
854
|
+
<img src="../images/reset-ex5.png" alt="reset ex5">
|
|
855
|
+
</div>
|
|
856
|
+
</div>
|
|
857
|
+
<div class="paragraph">
|
|
858
|
+
<p>At this point, if we run <code>git status</code>, we will see the file in green under “Changes to be committed” because the index and HEAD differ — that is, our proposed next commit is now different from our last commit.
|
|
859
|
+
Finally, we run <code>git commit</code> to finalize the commit.</p>
|
|
860
|
+
</div>
|
|
861
|
+
<div class="imageblock">
|
|
862
|
+
<div class="content">
|
|
863
|
+
<img src="../images/reset-ex6.png" alt="reset ex6">
|
|
864
|
+
</div>
|
|
865
|
+
</div>
|
|
866
|
+
<div class="paragraph">
|
|
867
|
+
<p>Now <code>git status</code> will give us no output, because all three trees are the same again.</p>
|
|
868
|
+
</div>
|
|
869
|
+
<div class="paragraph">
|
|
870
|
+
<p>Switching branches or cloning goes through a similar process.
|
|
871
|
+
When you checkout a branch, it changes <strong>HEAD</strong> to point to the new branch ref, populates your <strong>index</strong> with the snapshot of that commit, then copies the contents of the <strong>index</strong> into your <strong>working directory</strong>.</p>
|
|
872
|
+
</div>
|
|
873
|
+
</div>
|
|
874
|
+
<div class="sect3">
|
|
875
|
+
<h3 id="_the_role_of_reset">The Role of Reset</h3>
|
|
876
|
+
<div class="paragraph">
|
|
877
|
+
<p>The <code>reset</code> command makes more sense when viewed in this context.</p>
|
|
878
|
+
</div>
|
|
879
|
+
<div class="paragraph">
|
|
880
|
+
<p>For the purposes of these examples, let’s say that we’ve modified <code>file.txt</code> again and committed it a third time.
|
|
881
|
+
So now our history looks like this:</p>
|
|
882
|
+
</div>
|
|
883
|
+
<div class="imageblock">
|
|
884
|
+
<div class="content">
|
|
885
|
+
<img src="../images/reset-start.png" alt="reset start">
|
|
886
|
+
</div>
|
|
887
|
+
</div>
|
|
888
|
+
<div class="paragraph">
|
|
889
|
+
<p>Let’s now walk through exactly what <code>reset</code> does when you call it.
|
|
890
|
+
It directly manipulates these three trees in a simple and predictable way.
|
|
891
|
+
It does up to three basic operations.</p>
|
|
892
|
+
</div>
|
|
893
|
+
<div class="sect4">
|
|
894
|
+
<h4 id="_step_1_move_head">Step 1: Move HEAD</h4>
|
|
895
|
+
<div class="paragraph">
|
|
896
|
+
<p>The first thing <code>reset</code> will do is move what HEAD points to.
|
|
897
|
+
This isn’t the same as changing HEAD itself (which is what <code>checkout</code> does); <code>reset</code> moves the branch that HEAD is pointing to.
|
|
898
|
+
This means if HEAD is set to the <code>master</code> branch (i.e. you’re currently on the <code>master</code> branch), running <code>git reset 9e5e6a4</code> will start by making <code>master</code> point to <code>9e5e6a4</code>.</p>
|
|
899
|
+
</div>
|
|
900
|
+
<div class="imageblock">
|
|
901
|
+
<div class="content">
|
|
902
|
+
<img src="../images/reset-soft.png" alt="reset soft">
|
|
903
|
+
</div>
|
|
904
|
+
</div>
|
|
905
|
+
<div class="paragraph">
|
|
906
|
+
<p>No matter what form of <code>reset</code> with a commit you invoke, this is the first thing it will always try to do.
|
|
907
|
+
With <code>reset --soft</code>, it will simply stop there.</p>
|
|
908
|
+
</div>
|
|
909
|
+
<div class="paragraph">
|
|
910
|
+
<p>Now take a second to look at that diagram and realize what happened: it essentially undid the last <code>git commit</code> command.
|
|
911
|
+
When you run <code>git commit</code>, Git creates a new commit and moves the branch that HEAD points to up to it.
|
|
912
|
+
When you <code>reset</code> back to <code>HEAD~</code> (the parent of HEAD), you are moving the branch back to where it was, without changing the index or working directory.
|
|
913
|
+
You could now update the index and run <code>git commit</code> again to accomplish what <code>git commit --amend</code> would have done (see <a href="_git_amend.html">Changing the Last Commit</a>).</p>
|
|
914
|
+
</div>
|
|
915
|
+
</div>
|
|
916
|
+
<div class="sect4">
|
|
917
|
+
<h4 id="_step_2_updating_the_index_mixed">Step 2: Updating the Index (--mixed)</h4>
|
|
918
|
+
<div class="paragraph">
|
|
919
|
+
<p>Note that if you run <code>git status</code> now you’ll see in green the difference between the index and what the new HEAD is.</p>
|
|
920
|
+
</div>
|
|
921
|
+
<div class="paragraph">
|
|
922
|
+
<p>The next thing <code>reset</code> will do is to update the index with the contents of whatever snapshot HEAD now points to.</p>
|
|
923
|
+
</div>
|
|
924
|
+
<div class="imageblock">
|
|
925
|
+
<div class="content">
|
|
926
|
+
<img src="../images/reset-mixed.png" alt="reset mixed">
|
|
927
|
+
</div>
|
|
928
|
+
</div>
|
|
929
|
+
<div class="paragraph">
|
|
930
|
+
<p>If you specify the <code>--mixed</code> option, <code>reset</code> will stop at this point.
|
|
931
|
+
This is also the default, so if you specify no option at all (just <code>git reset HEAD~</code> in this case), this is where the command will stop.</p>
|
|
932
|
+
</div>
|
|
933
|
+
<div class="paragraph">
|
|
934
|
+
<p>Now take another second to look at that diagram and realize what happened: it still undid your last <code>commit</code>, but also <em>unstaged</em> everything.
|
|
935
|
+
You rolled back to before you ran all your <code>git add</code> and <code>git commit</code> commands.</p>
|
|
936
|
+
</div>
|
|
937
|
+
</div>
|
|
938
|
+
<div class="sect4">
|
|
939
|
+
<h4 id="_step_3_updating_the_working_directory_hard">Step 3: Updating the Working Directory (--hard)</h4>
|
|
940
|
+
<div class="paragraph">
|
|
941
|
+
<p>The third thing that <code>reset</code> will do is to make the working directory look like the index.
|
|
942
|
+
If you use the <code>--hard</code> option, it will continue to this stage.</p>
|
|
943
|
+
</div>
|
|
944
|
+
<div class="imageblock">
|
|
945
|
+
<div class="content">
|
|
946
|
+
<img src="../images/reset-hard.png" alt="reset hard">
|
|
947
|
+
</div>
|
|
948
|
+
</div>
|
|
949
|
+
<div class="paragraph">
|
|
950
|
+
<p>So let’s think about what just happened.
|
|
951
|
+
You undid your last commit, the <code>git add</code> and <code>git commit</code> commands, <strong>and</strong> all the work you did in your working directory.</p>
|
|
952
|
+
</div>
|
|
953
|
+
<div class="paragraph">
|
|
954
|
+
<p>It’s important to note that this flag (<code>--hard</code>) is the only way to make the <code>reset</code> command dangerous, and one of the very few cases where Git will actually destroy data.
|
|
955
|
+
Any other invocation of <code>reset</code> can be pretty easily undone, but the <code>--hard</code> option cannot, since it forcibly overwrites files in the working directory.
|
|
956
|
+
In this particular case, we still have the <strong>v3</strong> version of our file in a commit in our Git DB, and we could get it back by looking at our <code>reflog</code>, but if we had not committed it, Git still would have overwritten the file and it would be unrecoverable.</p>
|
|
957
|
+
</div>
|
|
958
|
+
</div>
|
|
959
|
+
<div class="sect4">
|
|
960
|
+
<h4 id="_recap">Recap</h4>
|
|
961
|
+
<div class="paragraph">
|
|
962
|
+
<p>The <code>reset</code> command overwrites these three trees in a specific order, stopping when you tell it to:</p>
|
|
963
|
+
</div>
|
|
964
|
+
<div class="olist arabic">
|
|
965
|
+
<ol class="arabic">
|
|
966
|
+
<li>
|
|
967
|
+
<p>Move the branch HEAD points to <em>(stop here if <code>--soft</code>)</em>.</p>
|
|
968
|
+
</li>
|
|
969
|
+
<li>
|
|
970
|
+
<p>Make the index look like HEAD <em>(stop here unless <code>--hard</code>)</em>.</p>
|
|
971
|
+
</li>
|
|
972
|
+
<li>
|
|
973
|
+
<p>Make the working directory look like the index.</p>
|
|
974
|
+
</li>
|
|
975
|
+
</ol>
|
|
976
|
+
</div>
|
|
977
|
+
</div>
|
|
978
|
+
</div>
|
|
979
|
+
<div class="sect3">
|
|
980
|
+
<h3 id="_reset_with_a_path">Reset With a Path</h3>
|
|
981
|
+
<div class="paragraph">
|
|
982
|
+
<p>That covers the behavior of <code>reset</code> in its basic form, but you can also provide it with a path to act upon.
|
|
983
|
+
If you specify a path, <code>reset</code> will skip step 1, and limit the remainder of its actions to a specific file or set of files.
|
|
984
|
+
This actually sort of makes sense — HEAD is just a pointer, and you can’t point to part of one commit and part of another.
|
|
985
|
+
But the index and working directory <em>can</em> be partially updated, so reset proceeds with steps 2 and 3.</p>
|
|
986
|
+
</div>
|
|
987
|
+
<div class="paragraph">
|
|
988
|
+
<p>So, assume we run <code>git reset file.txt</code>.
|
|
989
|
+
This form (since you did not specify a commit SHA-1 or branch, and you didn’t specify <code>--soft</code> or <code>--hard</code>) is shorthand for <code>git reset --mixed HEAD file.txt</code>, which will:</p>
|
|
990
|
+
</div>
|
|
991
|
+
<div class="olist arabic">
|
|
992
|
+
<ol class="arabic">
|
|
993
|
+
<li>
|
|
994
|
+
<p>Move the branch HEAD points to <em>(skipped)</em>.</p>
|
|
995
|
+
</li>
|
|
996
|
+
<li>
|
|
997
|
+
<p>Make the index look like HEAD <em>(stop here)</em>.</p>
|
|
998
|
+
</li>
|
|
999
|
+
</ol>
|
|
1000
|
+
</div>
|
|
1001
|
+
<div class="paragraph">
|
|
1002
|
+
<p>So it essentially just copies <code>file.txt</code> from HEAD to the index.</p>
|
|
1003
|
+
</div>
|
|
1004
|
+
<div class="imageblock">
|
|
1005
|
+
<div class="content">
|
|
1006
|
+
<img src="../images/reset-path1.png" alt="reset path1">
|
|
1007
|
+
</div>
|
|
1008
|
+
</div>
|
|
1009
|
+
<div class="paragraph">
|
|
1010
|
+
<p>This has the practical effect of <em>unstaging</em> the file.
|
|
1011
|
+
If we look at the diagram for that command and think about what <code>git add</code> does, they are exact opposites.</p>
|
|
1012
|
+
</div>
|
|
1013
|
+
<div class="imageblock">
|
|
1014
|
+
<div class="content">
|
|
1015
|
+
<img src="../images/reset-path2.png" alt="reset path2">
|
|
1016
|
+
</div>
|
|
1017
|
+
</div>
|
|
1018
|
+
<div class="paragraph">
|
|
1019
|
+
<p>This is why the output of the <code>git status</code> command suggests that you run this to unstage a file (see <a href="_unstaging.html">Unstaging a Staged File</a> for more on this).</p>
|
|
1020
|
+
</div>
|
|
1021
|
+
<div class="paragraph">
|
|
1022
|
+
<p>We could just as easily not let Git assume we meant “pull the data from HEAD” by specifying a specific commit to pull that file version from.
|
|
1023
|
+
We would just run something like <code>git reset eb43bf file.txt</code>.</p>
|
|
1024
|
+
</div>
|
|
1025
|
+
<div class="imageblock">
|
|
1026
|
+
<div class="content">
|
|
1027
|
+
<img src="../images/reset-path3.png" alt="reset path3">
|
|
1028
|
+
</div>
|
|
1029
|
+
</div>
|
|
1030
|
+
<div class="paragraph">
|
|
1031
|
+
<p>This effectively does the same thing as if we had reverted the content of the file to <strong>v1</strong> in the working directory, ran <code>git add</code> on it, then reverted it back to <strong>v3</strong> again (without actually going through all those steps).
|
|
1032
|
+
If we run <code>git commit</code> now, it will record a change that reverts that file back to <strong>v1</strong>, even though we never actually had it in our working directory again.</p>
|
|
1033
|
+
</div>
|
|
1034
|
+
<div class="paragraph">
|
|
1035
|
+
<p>It’s also interesting to note that like <code>git add</code>, the <code>reset</code> command will accept a <code>--patch</code> option to unstage content on a hunk-by-hunk basis.
|
|
1036
|
+
So you can selectively unstage or revert content.</p>
|
|
1037
|
+
</div>
|
|
1038
|
+
</div>
|
|
1039
|
+
<div class="sect3">
|
|
1040
|
+
<h3 id="_squashing_2">Squashing</h3>
|
|
1041
|
+
<div class="paragraph">
|
|
1042
|
+
<p>Let’s look at how to do something interesting with this newfound power — squashing commits.</p>
|
|
1043
|
+
</div>
|
|
1044
|
+
<div class="paragraph">
|
|
1045
|
+
<p>Say you have a series of commits with messages like “oops.”, “WIP” and “forgot this file”.
|
|
1046
|
+
You can use <code>reset</code> to quickly and easily squash them into a single commit that makes you look really smart.
|
|
1047
|
+
<a href="_squashing.html">Squashing Commits</a> shows another way to do this, but in this example it’s simpler to use <code>reset</code>.</p>
|
|
1048
|
+
</div>
|
|
1049
|
+
<div class="paragraph">
|
|
1050
|
+
<p>Let’s say you have a project where the first commit has one file, the second commit added a new file and changed the first, and the third commit changed the first file again.
|
|
1051
|
+
The second commit was a work in progress and you want to squash it down.</p>
|
|
1052
|
+
</div>
|
|
1053
|
+
<div class="imageblock">
|
|
1054
|
+
<div class="content">
|
|
1055
|
+
<img src="../images/reset-squash-r1.png" alt="reset squash r1">
|
|
1056
|
+
</div>
|
|
1057
|
+
</div>
|
|
1058
|
+
<div class="paragraph">
|
|
1059
|
+
<p>You can run <code>git reset --soft HEAD~2</code> to move the HEAD branch back to an older commit (the most recent commit you want to keep):</p>
|
|
1060
|
+
</div>
|
|
1061
|
+
<div class="imageblock">
|
|
1062
|
+
<div class="content">
|
|
1063
|
+
<img src="../images/reset-squash-r2.png" alt="reset squash r2">
|
|
1064
|
+
</div>
|
|
1065
|
+
</div>
|
|
1066
|
+
<div class="paragraph">
|
|
1067
|
+
<p>And then simply run <code>git commit</code> again:</p>
|
|
1068
|
+
</div>
|
|
1069
|
+
<div class="imageblock">
|
|
1070
|
+
<div class="content">
|
|
1071
|
+
<img src="../images/reset-squash-r3.png" alt="reset squash r3">
|
|
1072
|
+
</div>
|
|
1073
|
+
</div>
|
|
1074
|
+
<div class="paragraph">
|
|
1075
|
+
<p>Now you can see that your reachable history, the history you would push, now looks like you had one commit with <code>file-a.txt</code> v1, then a second that both modified <code>file-a.txt</code> to v3 and added <code>file-b.txt</code>.
|
|
1076
|
+
The commit with the v2 version of the file is no longer in the history.</p>
|
|
1077
|
+
</div>
|
|
1078
|
+
</div>
|
|
1079
|
+
<div class="sect3">
|
|
1080
|
+
<h3 id="_check_it_out">Check It Out</h3>
|
|
1081
|
+
<div class="paragraph">
|
|
1082
|
+
<p>Finally, you may wonder what the difference between <code>checkout</code> and <code>reset</code> is.
|
|
1083
|
+
Like <code>reset</code>, <code>checkout</code> manipulates the three trees, and it is a bit different depending on whether you give the command a file path or not.</p>
|
|
1084
|
+
</div>
|
|
1085
|
+
<div class="sect4">
|
|
1086
|
+
<h4 id="_without_paths">Without Paths</h4>
|
|
1087
|
+
<div class="paragraph">
|
|
1088
|
+
<p>Running <code>git checkout [branch]</code> is pretty similar to running <code>git reset --hard [branch]</code> in that it updates all three trees for you to look like <code>[branch]</code>, but there are two important differences.</p>
|
|
1089
|
+
</div>
|
|
1090
|
+
<div class="paragraph">
|
|
1091
|
+
<p>First, unlike <code>reset --hard</code>, <code>checkout</code> is working-directory safe; it will check to make sure it’s not blowing away files that have changes to them.
|
|
1092
|
+
Actually, it’s a bit smarter than that — it tries to do a trivial merge in the working directory, so all of the files you <em>haven’t</em> changed will be updated.
|
|
1093
|
+
<code>reset --hard</code>, on the other hand, will simply replace everything across the board without checking.</p>
|
|
1094
|
+
</div>
|
|
1095
|
+
<div class="paragraph">
|
|
1096
|
+
<p>The second important difference is how <code>checkout</code> updates HEAD.
|
|
1097
|
+
Whereas <code>reset</code> will move the branch that HEAD points to, <code>checkout</code> will move HEAD itself to point to another branch.</p>
|
|
1098
|
+
</div>
|
|
1099
|
+
<div class="paragraph">
|
|
1100
|
+
<p>For instance, say we have <code>master</code> and <code>develop</code> branches which point at different commits, and we’re currently on <code>develop</code> (so HEAD points to it).
|
|
1101
|
+
If we run <code>git reset master</code>, <code>develop</code> itself will now point to the same commit that <code>master</code> does.
|
|
1102
|
+
If we instead run <code>git checkout master</code>, <code>develop</code> does not move, HEAD itself does.
|
|
1103
|
+
HEAD will now point to <code>master</code>.</p>
|
|
1104
|
+
</div>
|
|
1105
|
+
<div class="paragraph">
|
|
1106
|
+
<p>So, in both cases we’re moving HEAD to point to commit A, but <em>how</em> we do so is very different.
|
|
1107
|
+
<code>reset</code> will move the branch HEAD points to, <code>checkout</code> moves HEAD itself.</p>
|
|
1108
|
+
</div>
|
|
1109
|
+
<div class="imageblock">
|
|
1110
|
+
<div class="content">
|
|
1111
|
+
<img src="../images/reset-checkout.png" alt="reset checkout">
|
|
1112
|
+
</div>
|
|
1113
|
+
</div>
|
|
1114
|
+
</div>
|
|
1115
|
+
<div class="sect4">
|
|
1116
|
+
<h4 id="_with_paths">With Paths</h4>
|
|
1117
|
+
<div class="paragraph">
|
|
1118
|
+
<p>The other way to run <code>checkout</code> is with a file path, which, like <code>reset</code>, does not move HEAD.
|
|
1119
|
+
It is just like <code>git reset [branch] file</code> in that it updates the index with that file at that commit, but it also overwrites the file in the working directory.
|
|
1120
|
+
It would be exactly like <code>git reset --hard [branch] file</code> (if <code>reset</code> would let you run that) — it’s not working-directory safe, and it does not move HEAD.</p>
|
|
1121
|
+
</div>
|
|
1122
|
+
<div class="paragraph">
|
|
1123
|
+
<p>Also, like <code>git reset</code> and <code>git add</code>, <code>checkout</code> will accept a <code>--patch</code> option to allow you to selectively revert file contents on a hunk-by-hunk basis.</p>
|
|
1124
|
+
</div>
|
|
1125
|
+
</div>
|
|
1126
|
+
</div>
|
|
1127
|
+
<div class="sect3">
|
|
1128
|
+
<h3 id="_summary_8">Summary</h3>
|
|
1129
|
+
<div class="paragraph">
|
|
1130
|
+
<p>Hopefully now you understand and feel more comfortable with the <code>reset</code> command, but are probably still a little confused about how exactly it differs from <code>checkout</code> and could not possibly remember all the rules of the different invocations.</p>
|
|
1131
|
+
</div>
|
|
1132
|
+
<div class="paragraph">
|
|
1133
|
+
<p>Here’s a cheat-sheet for which commands affect which trees.
|
|
1134
|
+
The “HEAD” column reads “REF” if that command moves the reference (branch) that HEAD points to, and “HEAD” if it moves HEAD itself.
|
|
1135
|
+
Pay especial attention to the 'WD Safe?' column — if it says <strong>NO</strong>, take a second to think before running that command.</p>
|
|
1136
|
+
</div>
|
|
1137
|
+
<table class="tableblock frame-all grid-all stretch">
|
|
1138
|
+
<colgroup>
|
|
1139
|
+
<col style="width: 42.8571%;">
|
|
1140
|
+
<col style="width: 14.2857%;">
|
|
1141
|
+
<col style="width: 14.2857%;">
|
|
1142
|
+
<col style="width: 14.2857%;">
|
|
1143
|
+
<col style="width: 14.2858%;">
|
|
1144
|
+
</colgroup>
|
|
1145
|
+
<thead>
|
|
1146
|
+
<tr>
|
|
1147
|
+
<th class="tableblock halign-left valign-top"></th>
|
|
1148
|
+
<th class="tableblock halign-left valign-top">HEAD</th>
|
|
1149
|
+
<th class="tableblock halign-left valign-top">Index</th>
|
|
1150
|
+
<th class="tableblock halign-left valign-top">Workdir</th>
|
|
1151
|
+
<th class="tableblock halign-left valign-top">WD Safe?</th>
|
|
1152
|
+
</tr>
|
|
1153
|
+
</thead>
|
|
1154
|
+
<tbody>
|
|
1155
|
+
<tr>
|
|
1156
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>Commit Level</strong></p></td>
|
|
1157
|
+
<td class="tableblock halign-left valign-top"></td>
|
|
1158
|
+
<td class="tableblock halign-left valign-top"></td>
|
|
1159
|
+
<td class="tableblock halign-left valign-top"></td>
|
|
1160
|
+
<td class="tableblock halign-left valign-top"></td>
|
|
1161
|
+
</tr>
|
|
1162
|
+
<tr>
|
|
1163
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>reset --soft [commit]</code></p></td>
|
|
1164
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">REF</p></td>
|
|
1165
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">NO</p></td>
|
|
1166
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">NO</p></td>
|
|
1167
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1168
|
+
</tr>
|
|
1169
|
+
<tr>
|
|
1170
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>reset [commit]</code></p></td>
|
|
1171
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">REF</p></td>
|
|
1172
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1173
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">NO</p></td>
|
|
1174
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1175
|
+
</tr>
|
|
1176
|
+
<tr>
|
|
1177
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>reset --hard [commit]</code></p></td>
|
|
1178
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">REF</p></td>
|
|
1179
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1180
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1181
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>NO</strong></p></td>
|
|
1182
|
+
</tr>
|
|
1183
|
+
<tr>
|
|
1184
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>checkout <commit></code></p></td>
|
|
1185
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">HEAD</p></td>
|
|
1186
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1187
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1188
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1189
|
+
</tr>
|
|
1190
|
+
<tr>
|
|
1191
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>File Level</strong></p></td>
|
|
1192
|
+
<td class="tableblock halign-left valign-top"></td>
|
|
1193
|
+
<td class="tableblock halign-left valign-top"></td>
|
|
1194
|
+
<td class="tableblock halign-left valign-top"></td>
|
|
1195
|
+
<td class="tableblock halign-left valign-top"></td>
|
|
1196
|
+
</tr>
|
|
1197
|
+
<tr>
|
|
1198
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>reset [commit] <paths></code></p></td>
|
|
1199
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">NO</p></td>
|
|
1200
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1201
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">NO</p></td>
|
|
1202
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1203
|
+
</tr>
|
|
1204
|
+
<tr>
|
|
1205
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>checkout [commit] <paths></code></p></td>
|
|
1206
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">NO</p></td>
|
|
1207
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1208
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock">YES</p></td>
|
|
1209
|
+
<td class="tableblock halign-left valign-top"><p class="tableblock"><strong>NO</strong></p></td>
|
|
1210
|
+
</tr>
|
|
1211
|
+
</tbody>
|
|
1212
|
+
</table>
|
|
1213
|
+
</div>
|
|
1214
|
+
<div id="nav"><a href="_removing_file_every_commit.html">prev</a> | <a href="_reverse_commit.html">next</a></div></div>
|
|
1215
|
+
</div>
|
|
1216
|
+
|
|
1217
|
+
</div>
|
|
1218
|
+
</div>
|
|
1219
|
+
<footer>
|
|
1220
|
+
<div class="site-source">
|
|
1221
|
+
<a href="https://git-scm.com/site">About this site</a><br>
|
|
1222
|
+
Patches, suggestions, and comments are welcome.
|
|
1223
|
+
</div>
|
|
1224
|
+
<div class="sfc-member">
|
|
1225
|
+
Git is a member of <a href="https://git-scm.com/sfc">Software Freedom Conservancy</a>
|
|
1226
|
+
</div>
|
|
1227
|
+
</footer>
|
|
1228
|
+
<a href="_the_index.html#top" class="no-js scrollToTop" id="scrollToTop" data-label="Scroll to top">
|
|
1229
|
+
<img src="../../../../images/icons/chevron-up@2x.png" width="20" height="20" alt="scroll-to-top"/>
|
|
1230
|
+
</a>
|
|
1231
|
+
<script src="../../../../assets/application-38b0d42ff05ffea45841edebbd14b75b89585646153808e82907c2c5c11f324b.js"></script>
|
|
1232
|
+
|
|
1233
|
+
</div>
|
|
1234
|
+
|
|
1235
|
+
</body>
|
|
1236
|
+
</html>
|