wayfarer 0.4.7 → 0.4.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.env +17 -0
- data/.github/workflows/lint.yaml +8 -6
- data/.github/workflows/release.yaml +2 -3
- data/.github/workflows/tests.yaml +5 -14
- data/.gitignore +2 -2
- data/.rubocop.yml +31 -0
- data/.vale.ini +6 -3
- data/Dockerfile +3 -2
- data/Gemfile +21 -0
- data/Gemfile.lock +233 -128
- data/Rakefile +7 -0
- data/docker-compose.yml +13 -14
- data/docs/guides/callbacks.md +3 -1
- data/docs/guides/configuration.md +10 -35
- data/docs/guides/development.md +67 -0
- data/docs/guides/handlers.md +7 -7
- data/docs/guides/jobs.md +54 -11
- data/docs/guides/networking/custom_adapters.md +109 -81
- data/docs/guides/networking/http.md +1 -1
- data/docs/guides/pages.md +24 -22
- data/docs/guides/routing.md +116 -34
- data/docs/guides/tasks.md +30 -10
- data/docs/guides/tutorial.md +23 -17
- data/docs/guides/user_agents.md +11 -9
- data/lib/wayfarer/base.rb +9 -8
- data/lib/wayfarer/batch_completion.rb +18 -14
- data/lib/wayfarer/callbacks.rb +14 -14
- data/lib/wayfarer/cli/route_printer.rb +78 -96
- data/lib/wayfarer/cli.rb +12 -30
- data/lib/wayfarer/gc.rb +6 -1
- data/lib/wayfarer/kv.rb +28 -0
- data/lib/wayfarer/middleware/base.rb +0 -4
- data/lib/wayfarer/middleware/chain.rb +7 -1
- data/lib/wayfarer/middleware/content_type.rb +20 -15
- data/lib/wayfarer/middleware/controller.rb +1 -1
- data/lib/wayfarer/middleware/dedup.rb +9 -3
- data/lib/wayfarer/middleware/dispatch.rb +7 -2
- data/lib/wayfarer/middleware/normalize.rb +4 -12
- data/lib/wayfarer/middleware/router.rb +1 -1
- data/lib/wayfarer/middleware/uri_parser.rb +4 -3
- data/lib/wayfarer/networking/context.rb +13 -2
- data/lib/wayfarer/networking/ferrum.rb +2 -5
- data/lib/wayfarer/networking/follow.rb +2 -1
- data/lib/wayfarer/networking/pool.rb +11 -12
- data/lib/wayfarer/networking/selenium.rb +15 -7
- data/lib/wayfarer/networking/strategy.rb +6 -2
- data/lib/wayfarer/page.rb +0 -2
- data/lib/wayfarer/parsing/xml.rb +1 -1
- data/lib/wayfarer/parsing.rb +2 -5
- data/lib/wayfarer/redis/barrier.rb +15 -2
- data/lib/wayfarer/redis/counter.rb +1 -2
- data/lib/wayfarer/routing/dsl.rb +166 -31
- data/lib/wayfarer/routing/hash_stack.rb +33 -0
- data/lib/wayfarer/routing/matchers/custom.rb +8 -5
- data/lib/wayfarer/routing/matchers/{suffix.rb → empty_params.rb} +2 -6
- data/lib/wayfarer/routing/matchers/host.rb +15 -9
- data/lib/wayfarer/routing/matchers/path.rb +11 -33
- data/lib/wayfarer/routing/matchers/query.rb +41 -17
- data/lib/wayfarer/routing/matchers/result.rb +12 -0
- data/lib/wayfarer/routing/matchers/scheme.rb +13 -5
- data/lib/wayfarer/routing/matchers/url.rb +13 -5
- data/lib/wayfarer/routing/path_consumer.rb +130 -0
- data/lib/wayfarer/routing/path_finder.rb +151 -23
- data/lib/wayfarer/routing/result.rb +1 -1
- data/lib/wayfarer/routing/root_route.rb +14 -2
- data/lib/wayfarer/routing/route.rb +71 -14
- data/lib/wayfarer/routing/serializable.rb +28 -0
- data/lib/wayfarer/routing/sub_route.rb +53 -0
- data/lib/wayfarer/routing/target_route.rb +17 -1
- data/lib/wayfarer/stringify.rb +1 -2
- data/lib/wayfarer/task.rb +3 -5
- data/lib/wayfarer/uri/normalization.rb +120 -0
- data/lib/wayfarer.rb +55 -10
- data/mise.toml +2 -0
- data/mkdocs.yml +8 -17
- data/rake/lint.rake +0 -96
- data/rake/release.rake +1 -13
- data/rake/tests.rake +8 -4
- data/requirements.txt +1 -1
- data/spec/factories/job.rb +8 -0
- data/spec/factories/middleware.rb +2 -2
- data/spec/factories/path_finder.rb +11 -0
- data/spec/factories/redis.rb +19 -0
- data/spec/factories/task.rb +39 -1
- data/spec/spec_helpers.rb +50 -57
- data/spec/support/active_job_helpers.rb +8 -0
- data/spec/support/integration_helpers.rb +21 -0
- data/spec/support/redis_helpers.rb +9 -0
- data/spec/support/test_app.rb +64 -43
- data/spec/{base_spec.rb → wayfarer/base_spec.rb} +32 -36
- data/spec/wayfarer/batch_completion_spec.rb +142 -0
- data/spec/wayfarer/cli/job_spec.rb +88 -0
- data/spec/wayfarer/cli/routing_spec.rb +322 -0
- data/spec/{cli → wayfarer/cli}/version_spec.rb +1 -1
- data/spec/wayfarer/gc_spec.rb +29 -0
- data/spec/{handler_spec.rb → wayfarer/handler_spec.rb} +1 -3
- data/spec/{integration → wayfarer/integration}/callbacks_spec.rb +9 -6
- data/spec/wayfarer/integration/content_type_spec.rb +37 -0
- data/spec/wayfarer/integration/custom_routing_spec.rb +51 -0
- data/spec/{integration → wayfarer/integration}/gc_spec.rb +9 -13
- data/spec/{integration → wayfarer/integration}/handler_spec.rb +9 -10
- data/spec/{integration → wayfarer/integration}/page_spec.rb +16 -14
- data/spec/{integration → wayfarer/integration}/params_spec.rb +4 -4
- data/spec/{integration → wayfarer/integration}/parsing_spec.rb +7 -32
- data/spec/wayfarer/integration/retry_spec.rb +112 -0
- data/spec/{integration → wayfarer/integration}/stage_spec.rb +6 -6
- data/spec/{middleware → wayfarer/middleware}/batch_completion_spec.rb +4 -5
- data/spec/{middleware → wayfarer/middleware}/chain_spec.rb +20 -15
- data/spec/{middleware → wayfarer/middleware}/content_type_spec.rb +18 -21
- data/spec/{middleware → wayfarer/middleware}/controller_spec.rb +25 -24
- data/spec/wayfarer/middleware/dedup_spec.rb +66 -0
- data/spec/wayfarer/middleware/normalize_spec.rb +32 -0
- data/spec/{middleware → wayfarer/middleware}/router_spec.rb +18 -20
- data/spec/{middleware → wayfarer/middleware}/stage_spec.rb +11 -10
- data/spec/wayfarer/middleware/uri_parser_spec.rb +63 -0
- data/spec/{middleware → wayfarer/middleware}/user_agent_spec.rb +34 -32
- data/spec/wayfarer/networking/capybara_spec.rb +13 -0
- data/spec/{networking → wayfarer/networking}/context_spec.rb +47 -38
- data/spec/wayfarer/networking/ferrum_spec.rb +13 -0
- data/spec/{networking → wayfarer/networking}/follow_spec.rb +9 -4
- data/spec/wayfarer/networking/http_spec.rb +12 -0
- data/spec/{networking → wayfarer/networking}/pool_spec.rb +11 -9
- data/spec/wayfarer/networking/selenium_spec.rb +12 -0
- data/spec/{networking → wayfarer/networking}/strategy.rb +35 -56
- data/spec/{page_spec.rb → wayfarer/page_spec.rb} +3 -3
- data/spec/{parsing → wayfarer/parsing}/json_spec.rb +1 -1
- data/spec/{parsing/xml_spec.rb → wayfarer/parsing/xml_parse_spec.rb} +4 -3
- data/spec/{redis → wayfarer/redis}/barrier_spec.rb +5 -4
- data/spec/wayfarer/redis/counter_spec.rb +34 -0
- data/spec/{redis → wayfarer/redis}/pool_spec.rb +3 -2
- data/spec/{routing → wayfarer/routing}/dsl_spec.rb +12 -22
- data/spec/wayfarer/routing/hash_stack_spec.rb +63 -0
- data/spec/wayfarer/routing/integration_spec.rb +101 -0
- data/spec/wayfarer/routing/matchers/custom_spec.rb +39 -0
- data/spec/wayfarer/routing/matchers/host_spec.rb +56 -0
- data/spec/wayfarer/routing/matchers/matcher.rb +17 -0
- data/spec/wayfarer/routing/matchers/path_spec.rb +43 -0
- data/spec/wayfarer/routing/matchers/query_spec.rb +123 -0
- data/spec/wayfarer/routing/matchers/scheme_spec.rb +45 -0
- data/spec/wayfarer/routing/matchers/url_spec.rb +33 -0
- data/spec/wayfarer/routing/path_consumer_spec.rb +123 -0
- data/spec/wayfarer/routing/path_finder_spec.rb +409 -0
- data/spec/wayfarer/routing/root_route_spec.rb +51 -0
- data/spec/wayfarer/routing/route_spec.rb +74 -0
- data/spec/wayfarer/routing/sub_route_spec.rb +103 -0
- data/spec/wayfarer/uri/normalization_spec.rb +98 -0
- data/spec/wayfarer_spec.rb +2 -2
- data/wayfarer.gemspec +17 -28
- metadata +183 -832
- data/.rbenv-gemsets +0 -1
- data/.ruby-version +0 -1
- data/RELEASING.md +0 -17
- data/docs/cookbook/user_agent.md +0 -7
- data/docs/design.md +0 -36
- data/docs/guides/jobs/error_handling.md +0 -40
- data/docs/reference/configuration.md +0 -36
- data/lib/wayfarer/middleware/lazy.rb +0 -11
- data/spec/batch_completion_spec.rb +0 -104
- data/spec/cli/job_spec.rb +0 -74
- data/spec/cli/routing_spec.rb +0 -101
- data/spec/fixtures/dummy_job.rb +0 -9
- data/spec/gc_spec.rb +0 -17
- data/spec/integration/content_type_spec.rb +0 -145
- data/spec/integration/routing_spec.rb +0 -18
- data/spec/middleware/dedup_spec.rb +0 -71
- data/spec/middleware/dispatch_spec.rb +0 -59
- data/spec/middleware/normalize_spec.rb +0 -60
- data/spec/middleware/uri_parser_spec.rb +0 -53
- data/spec/networking/capybara_spec.rb +0 -12
- data/spec/networking/ferrum_spec.rb +0 -12
- data/spec/networking/http_spec.rb +0 -12
- data/spec/networking/selenium_spec.rb +0 -12
- data/spec/redis/counter_spec.rb +0 -44
- data/spec/routing/integration_spec.rb +0 -110
- data/spec/routing/matchers/custom_spec.rb +0 -31
- data/spec/routing/matchers/host_spec.rb +0 -49
- data/spec/routing/matchers/path_spec.rb +0 -43
- data/spec/routing/matchers/query_spec.rb +0 -137
- data/spec/routing/matchers/scheme_spec.rb +0 -25
- data/spec/routing/matchers/suffix_spec.rb +0 -41
- data/spec/routing/matchers/uri_spec.rb +0 -27
- data/spec/routing/path_finder_spec.rb +0 -33
- data/spec/routing/root_route_spec.rb +0 -29
- data/spec/routing/route_spec.rb +0 -43
- data/spec/support/static/git-scm.com/assets/application-38b0d42ff05ffea45841edebbd14b75b89585646153808e82907c2c5c11f324b.js +0 -772
- data/spec/support/static/git-scm.com/assets/application-cafcf280f67db0e6d8168ba98a38da878769a9d5f37793b68ffb963a02d185e0.css +0 -1
- data/spec/support/static/git-scm.com/assets/modernize-b3ebe0c31c24f230dc62179d3e1030d2e57a53b1668d9382c0a27dbd44a94beb.js +0 -20
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-Bash.html +0 -751
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-PowerShell.html +0 -804
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-Sublime-Text.html +0 -728
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-Visual-Studio-Code.html +0 -751
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-Visual-Studio.html +0 -740
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Git-in-Zsh.html +0 -765
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Graphical-Interfaces.html +0 -931
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-A:-Git-in-Other-Environments-Summary.html +0 -702
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-B:-Embedding-Git-in-your-Applications-Command-line-Git.html +0 -720
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-B:-Embedding-Git-in-your-Applications-Dulwich.html +0 -746
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-B:-Embedding-Git-in-your-Applications-JGit.html +0 -889
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-B:-Embedding-Git-in-your-Applications-Libgit2.html +0 -1003
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-B:-Embedding-Git-in-your-Applications-go-git.html +0 -792
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Administration.html +0 -745
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Basic-Snapshotting.html +0 -840
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Branching-and-Merging.html +0 -829
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Debugging.html +0 -731
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Email.html +0 -766
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-External-Systems.html +0 -721
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Getting-and-Creating-Projects.html +0 -746
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Inspection-and-Comparison.html +0 -735
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Patching.html +0 -742
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Plumbing-Commands.html +0 -715
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Setup-and-Config.html +0 -863
- data/spec/support/static/git-scm.com/book/en/v2/Appendix-C:-Git-Commands-Sharing-and-Updating-Projects.html +0 -802
- data/spec/support/static/git-scm.com/book/en/v2/Customizing-Git-An-Example-Git-Enforced-Policy.html +0 -1200
- data/spec/support/static/git-scm.com/book/en/v2/Customizing-Git-Git-Attributes.html +0 -1134
- data/spec/support/static/git-scm.com/book/en/v2/Customizing-Git-Git-Configuration.html +0 -1315
- data/spec/support/static/git-scm.com/book/en/v2/Customizing-Git-Git-Hooks.html +0 -876
- data/spec/support/static/git-scm.com/book/en/v2/Customizing-Git-Summary.html +0 -704
- data/spec/support/static/git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project.html +0 -1667
- data/spec/support/static/git-scm.com/book/en/v2/Distributed-Git-Distributed-Workflows.html +0 -859
- data/spec/support/static/git-scm.com/book/en/v2/Distributed-Git-Maintaining-a-Project.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/Distributed-Git-Summary.html +0 -704
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-A-Short-History-of-Git.html +0 -735
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-About-Version-Control.html +0 -783
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup.html +0 -889
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-Getting-Help.html +0 -750
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-Installing-Git.html +0 -879
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-Summary.html +0 -704
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-The-Command-Line.html +0 -711
- data/spec/support/static/git-scm.com/book/en/v2/Getting-Started-What-is-Git?.html +0 -857
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository.html +0 -816
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Git-Aliases.html +0 -775
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository.html +0 -1432
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Summary.html +0 -703
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Tagging.html +0 -1049
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Undoing-Things.html +0 -998
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Viewing-the-Commit-History.html +0 -1172
- data/spec/support/static/git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes.html +0 -983
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging.html +0 -1102
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Branch-Management.html +0 -946
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell.html +0 -1020
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Branching-Workflows.html +0 -786
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Rebasing.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Remote-Branches.html +0 -1009
- data/spec/support/static/git-scm.com/book/en/v2/Git-Branching-Summary.html +0 -705
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Environment-Variables.html +0 -1009
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Git-Objects.html +0 -1209
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Git-References.html +0 -939
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Maintenance-and-Data-Recovery.html +0 -1086
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Packfiles.html +0 -876
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Plumbing-and-Porcelain.html +0 -745
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Summary.html +0 -708
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-The-Refspec.html +0 -872
- data/spec/support/static/git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols.html +0 -1043
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Advanced-Merging.html +0 -1605
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Bundling.html +0 -888
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Credential-Storage.html +0 -1035
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Debugging-with-Git.html +0 -861
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Interactive-Staging.html +0 -920
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Replace.html +0 -949
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Rerere.html +0 -983
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Reset-Demystified.html +0 -1236
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Revision-Selection.html +0 -1178
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Rewriting-History.html +0 -1182
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Searching.html +0 -875
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work.html +0 -922
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Stashing-and-Cleaning.html +0 -1039
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Submodules.html +0 -1864
- data/spec/support/static/git-scm.com/book/en/v2/Git-Tools-Summary.html +0 -705
- data/spec/support/static/git-scm.com/book/en/v2/Git-and-Other-Systems-Git-as-a-Client.html +0 -2656
- data/spec/support/static/git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git.html +0 -1741
- data/spec/support/static/git-scm.com/book/en/v2/Git-and-Other-Systems-Summary.html +0 -703
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Generating-Your-SSH-Public-Key.html +0 -759
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Getting-Git-on-a-Server.html +0 -827
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Git-Daemon.html +0 -775
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-GitLab.html +0 -872
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-GitWeb.html +0 -776
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Setting-Up-the-Server.html +0 -870
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Smart-HTTP.html +0 -789
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Summary.html +0 -709
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols.html +0 -963
- data/spec/support/static/git-scm.com/book/en/v2/Git-on-the-Server-Third-Party-Hosted-Options.html +0 -711
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Account-Setup-and-Configuration.html +0 -858
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Maintaining-a-Project.html +0 -1218
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Managing-an-organization.html +0 -797
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Scripting-GitHub.html +0 -1059
- data/spec/support/static/git-scm.com/book/en/v2/GitHub-Summary.html +0 -704
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_abort_merge.html +0 -1605
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_add_email_addresses.html +0 -858
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_advanced_merging.html +0 -1605
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_an_example_git_enforced_policy.html +0 -1200
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_annotated_tags.html +0 -1049
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_api_comment.html +0 -1059
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_bare_repo.html +0 -827
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_basic_branching.html +0 -1102
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_basic_merge_conflicts.html +0 -1102
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_basic_merging.html +0 -1102
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_binary_search.html +0 -861
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_branch_management.html +0 -946
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_branch_references.html +0 -1178
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_build_number.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_bundling.html +0 -888
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_changing_multiple.html +0 -1182
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_checking_out_conflicts.html +0 -1605
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_checking_out_remotes.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_checking_status.html +0 -1432
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_cloning_submodules.html +0 -1864
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_commit_guidelines.html +0 -1667
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_commit_ranges.html +0 -1178
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_commit_status.html +0 -1059
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_committing_changes.html +0 -1432
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_contrib_file.html +0 -1218
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_contributing_project.html +0 -1667
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_create_new_branch.html +0 -1020
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_credential_caching.html +0 -1035
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_custom_importer.html +0 -1741
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_data_recovery.html +0 -1086
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_delete_branches.html +0 -1009
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_editor.html +0 -889
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_eg_task_lists.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_email_hooks.html +0 -876
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_email_notification.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_email_notifications.html +0 -1218
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_email_pr.html +0 -1218
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_enforcing_commit_message_format.html +0 -1200
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_example_markdown.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_external_merge_tools.html +0 -1315
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_fetch_and_push_on_different_repositories.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_fetching_and_pulling.html +0 -983
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_file_annotation.html +0 -861
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_first_time.html +0 -889
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_generate_ssh_key.html +0 -759
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_getting_a_repo.html +0 -816
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_getting_git_on_a_server.html +0 -827
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_aliases.html +0 -775
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_am.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_amend.html +0 -1182
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_branches_overview.html +0 -1020
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_clean.html +0 -1039
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_cloning.html +0 -816
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_commit_objects.html +0 -1209
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_config.html +0 -1315
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_diff_staged.html +0 -1432
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_gc.html +0 -1086
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_grep.html +0 -875
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_help.html +0 -750
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_hooks.html +0 -876
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_mv.html +0 -1432
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_p4.html +0 -1741
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_p4_branches.html +0 -2656
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_reflog.html +0 -1178
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_refs.html +0 -939
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_reset.html +0 -1236
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_stashing.html +0 -1039
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_submodules.html +0 -1864
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_svn.html +0 -2656
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_git_tagging.html +0 -1049
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_gitlab_groups_section.html +0 -872
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_ignoring.html +0 -1432
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_inspecting_remote.html +0 -983
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_integration_manager.html +0 -859
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_interactive_staging.html +0 -920
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_keyword_expansion.html +0 -1134
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_libgit2_bindings.html +0 -1003
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_manual_remerge.html +0 -1605
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_md_code.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_md_drag.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_md_emoji.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_md_quote.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_merge_button.html +0 -1218
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_merge_log.html +0 -1605
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_merge_rebase_work.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_new_repo_dropdown.html +0 -1218
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_not_center.html +0 -1218
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_org_page.html +0 -797
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_other_client_hooks.html +0 -876
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_p4_git_fusion.html +0 -2656
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_patches_from_email.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_personal_avatar.html +0 -858
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_plumbing_porcelain.html +0 -745
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_closed.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_discussion.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_fail.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_final.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_references.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_references_render.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pr_refs.html +0 -1218
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pre_merge_rebase_work.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_preparing_release.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_private_team.html +0 -1667
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_project_over_email.html +0 -1667
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_public_project.html +0 -1667
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_publishing_submodules.html +0 -1864
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pushing_branches.html +0 -1009
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pushing_refspecs.html +0 -872
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_pushing_remotes.html +0 -983
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rebase_cherry_pick.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rebase_peril.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rebase_rebase.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rebase_rebase_work.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rebasing.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_refspec.html +0 -872
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_remote_branches.html +0 -1009
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_remote_repos.html +0 -983
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_removing_file_every_commit.html +0 -1182
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_removing_files.html +0 -1432
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_removing_objects.html +0 -1086
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_replace.html +0 -949
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_reverse_commit.html +0 -1605
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_revision_selection.html +0 -1178
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_rewriting_history.html +0 -1182
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_searching.html +0 -875
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_service_config.html +0 -1059
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_services_hooks.html +0 -1059
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_setting_up_server.html +0 -870
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_sharing_tags.html +0 -1049
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_signing.html +0 -922
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_signing_commits.html +0 -922
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_squashing.html +0 -1182
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_starting_submodules.html +0 -1864
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_subtree_merge.html +0 -1605
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_switching_branches.html +0 -1020
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_tagging_releases.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_task_list_progress.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_team_page.html +0 -797
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_the_index.html +0 -1236
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_the_shortlog.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_topic_branch.html +0 -786
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_tracking_branches.html +0 -1009
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_tracking_files.html +0 -1432
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_tree_objects.html +0 -1209
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_triple_dot.html +0 -1178
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_undoing.html +0 -998
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_unstaging.html +0 -998
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_viewing_history.html +0 -1172
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_web_hook.html +0 -1059
- data/spec/support/static/git-scm.com/book/en/v2/ch00/_what_is_introduced.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch01-getting-started.html +0 -783
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch02-git-basics-chapter.html +0 -816
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch03-git-branching.html +0 -1020
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch05-distributed-git.html +0 -859
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch06-github.html +0 -858
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch06-github_flow.html +0 -1502
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch10-git-internals.html +0 -745
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ch_core_editor.html +0 -863
- data/spec/support/static/git-scm.com/book/en/v2/ch00/divergent_history.html +0 -1020
- data/spec/support/static/git-scm.com/book/en/v2/ch00/double_dot.html +0 -1178
- data/spec/support/static/git-scm.com/book/en/v2/ch00/filters_a.html +0 -1134
- data/spec/support/static/git-scm.com/book/en/v2/ch00/filters_b.html +0 -1134
- data/spec/support/static/git-scm.com/book/en/v2/ch00/limit_options.html +0 -1172
- data/spec/support/static/git-scm.com/book/en/v2/ch00/log_options.html +0 -1172
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_a.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_b.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_c.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_d.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_e.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/merwf_f.html +0 -1354
- data/spec/support/static/git-scm.com/book/en/v2/ch00/oh_my_zsh_git.html +0 -765
- data/spec/support/static/git-scm.com/book/en/v2/ch00/pretty_format.html +0 -1172
- data/spec/support/static/git-scm.com/book/en/v2/ch00/psp_b.html +0 -1667
- data/spec/support/static/git-scm.com/book/en/v2/ch00/rbdiag_e.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/ch00/rbdiag_g.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/ch00/rbdiag_h.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/ch00/rbdiag_i.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/ch00/rebasing-merging-example.html +0 -1028
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ref_rerere.html +0 -983
- data/spec/support/static/git-scm.com/book/en/v2/ch00/ref_the_ref.html +0 -939
- data/spec/support/static/git-scm.com/book/en/v2/ch00/wfdiag_b.html +0 -859
- data/spec/support/static/git-scm.com/book/en/v2/ch00/wfdiag_c.html +0 -859
- data/spec/support/static/git-scm.com/book/en/v2/ch00/what_is_git_section.html +0 -857
- 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 +0 -688
- 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/support/static/graph/details/a.html +0 -10
- data/spec/support/static/graph/details/b.html +0 -10
- data/spec/support/static/graph/index.html +0 -20
- data/spec/support/static/links/links.html +0 -28
- data/docs/{reference → guides}/cli.md +0 -0
- data/spec/{stringify_spec.rb → wayfarer/stringify_spec.rb} +2 -2
- /data/spec/{task_spec.rb → wayfarer/task_spec.rb} +0 -0
|
@@ -1,1315 +0,0 @@
|
|
|
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 - Git Configuration</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="_external_merge_tools.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" >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" class=active>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>8.1 Customizing Git - Git Configuration</h1>
|
|
675
|
-
<div><p>So far, we’ve covered the basics of how Git works and how to use it, and we’ve introduced a number of tools that Git provides to help you use it easily and efficiently.
|
|
676
|
-
In this chapter, we’ll see how you can make Git operate in a more customized fashion, by introducing several important configuration settings and the hooks system.
|
|
677
|
-
With these tools, it’s easy to get Git to work exactly the way you, your company, or your group needs it to.</p>
|
|
678
|
-
<h2 id="_git_config">Git Configuration</h2>
|
|
679
|
-
<div class="paragraph">
|
|
680
|
-
<p>
|
|
681
|
-
As you read briefly in <a href="ch01-getting-started.html">Getting Started</a>, you can specify Git configuration settings with the <code>git config</code> command.
|
|
682
|
-
One of the first things you did was set up your name and email address:</p>
|
|
683
|
-
</div>
|
|
684
|
-
<div class="listingblock">
|
|
685
|
-
<div class="content">
|
|
686
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global user.name "John Doe"
|
|
687
|
-
$ git config --global user.email johndoe@example.com</code></pre>
|
|
688
|
-
</div>
|
|
689
|
-
</div>
|
|
690
|
-
<div class="paragraph">
|
|
691
|
-
<p>Now you’ll learn a few of the more interesting options that you can set in this manner to customize your Git usage.</p>
|
|
692
|
-
</div>
|
|
693
|
-
<div class="paragraph">
|
|
694
|
-
<p>First, a quick review: Git uses a series of configuration files to determine non-default behavior that you may want.
|
|
695
|
-
The first place Git looks for these values is in the system-wide <code>[path]/etc/gitconfig</code> file, which contains settings that are applied to every user on the system and all of their repositories.
|
|
696
|
-
If you pass the option <code>--system</code> to <code>git config</code>, it reads and writes from this file specifically.</p>
|
|
697
|
-
</div>
|
|
698
|
-
<div class="paragraph">
|
|
699
|
-
<p>The next place Git looks is the <code>~/.gitconfig</code> (or <code>~/.config/git/config</code>) file, which is specific to each user.
|
|
700
|
-
You can make Git read and write to this file by passing the <code>--global</code> option.</p>
|
|
701
|
-
</div>
|
|
702
|
-
<div class="paragraph">
|
|
703
|
-
<p>Finally, Git looks for configuration values in the configuration file in the Git directory (<code>.git/config</code>) of whatever repository you’re currently using.
|
|
704
|
-
These values are specific to that single repository, and represent passing the <code>--local</code> option to <code>git config</code>.
|
|
705
|
-
If you don’t specify which level you want to work with, this is the default.</p>
|
|
706
|
-
</div>
|
|
707
|
-
<div class="paragraph">
|
|
708
|
-
<p>Each of these “levels” (system, global, local) overwrites values in the previous level, so values in <code>.git/config</code> trump those in <code>[path]/etc/gitconfig</code>, for instance.</p>
|
|
709
|
-
</div>
|
|
710
|
-
<div class="admonitionblock note">
|
|
711
|
-
<table>
|
|
712
|
-
<tr>
|
|
713
|
-
<td class="icon">
|
|
714
|
-
<div class="title">Note</div>
|
|
715
|
-
</td>
|
|
716
|
-
<td class="content">
|
|
717
|
-
<div class="paragraph">
|
|
718
|
-
<p>Git’s configuration files are plain-text, so you can also set these values by manually editing the file and inserting the correct syntax.
|
|
719
|
-
It’s generally easier to run the <code>git config</code> command, though.</p>
|
|
720
|
-
</div>
|
|
721
|
-
</td>
|
|
722
|
-
</tr>
|
|
723
|
-
</table>
|
|
724
|
-
</div>
|
|
725
|
-
<div class="sect3">
|
|
726
|
-
<h3 id="_basic_client_configuration">Basic Client Configuration</h3>
|
|
727
|
-
<div class="paragraph">
|
|
728
|
-
<p>The configuration options recognized by Git fall into two categories: client-side and server-side.
|
|
729
|
-
The majority of the options are client-side — configuring your personal working preferences.
|
|
730
|
-
Many, <em>many</em> configuration options are supported, but a large fraction of them are useful only in certain edge cases; we’ll cover just the most common and useful options here.
|
|
731
|
-
If you want to see a list of all the options your version of Git recognizes, you can run:</p>
|
|
732
|
-
</div>
|
|
733
|
-
<div class="listingblock">
|
|
734
|
-
<div class="content">
|
|
735
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ man git-config</code></pre>
|
|
736
|
-
</div>
|
|
737
|
-
</div>
|
|
738
|
-
<div class="paragraph">
|
|
739
|
-
<p>This command lists all the available options in quite a bit of detail.
|
|
740
|
-
You can also find this reference material at <a href="https://git-scm.com/docs/git-config" class="bare">https://git-scm.com/docs/git-config</a>.</p>
|
|
741
|
-
</div>
|
|
742
|
-
<div class="sect4">
|
|
743
|
-
<h4 id="_core_editor"><code>core.editor</code></h4>
|
|
744
|
-
<div class="paragraph">
|
|
745
|
-
<p>
|
|
746
|
-
By default, Git uses whatever you’ve set as your default text editor via one of the shell environment variables <code>VISUAL</code> or <code>EDITOR</code>, or else falls back to the <code>vi</code> editor to create and edit your commit and tag messages.
|
|
747
|
-
To change that default to something else, you can use the <code>core.editor</code> setting:</p>
|
|
748
|
-
</div>
|
|
749
|
-
<div class="listingblock">
|
|
750
|
-
<div class="content">
|
|
751
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global core.editor emacs</code></pre>
|
|
752
|
-
</div>
|
|
753
|
-
</div>
|
|
754
|
-
<div class="paragraph">
|
|
755
|
-
<p>Now, no matter what is set as your default shell editor, Git will fire up Emacs to edit messages.</p>
|
|
756
|
-
</div>
|
|
757
|
-
</div>
|
|
758
|
-
<div class="sect4">
|
|
759
|
-
<h4 id="_commit_template"><code>commit.template</code></h4>
|
|
760
|
-
<div class="paragraph">
|
|
761
|
-
<p>
|
|
762
|
-
If you set this to the path of a file on your system, Git will use that file as the default initial message when you commit.
|
|
763
|
-
The value in creating a custom commit template is that you can use it to remind yourself (or others) of the proper format and style when creating a commit message.</p>
|
|
764
|
-
</div>
|
|
765
|
-
<div class="paragraph">
|
|
766
|
-
<p>For instance, consider a template file at <code>~/.gitmessage.txt</code> that looks like this:</p>
|
|
767
|
-
</div>
|
|
768
|
-
<div class="listingblock">
|
|
769
|
-
<div class="content">
|
|
770
|
-
<pre class="highlight"><code class="language-text" data-lang="text">Subject line (try to keep under 50 characters)
|
|
771
|
-
|
|
772
|
-
Multi-line description of commit,
|
|
773
|
-
feel free to be detailed.
|
|
774
|
-
|
|
775
|
-
[Ticket: X]</code></pre>
|
|
776
|
-
</div>
|
|
777
|
-
</div>
|
|
778
|
-
<div class="paragraph">
|
|
779
|
-
<p>Note how this commit template reminds the committer to keep the subject line short (for the sake of <code>git log --oneline</code> output), to add further detail under that, and to refer to an issue or bug tracker ticket number if one exists.</p>
|
|
780
|
-
</div>
|
|
781
|
-
<div class="paragraph">
|
|
782
|
-
<p>To tell Git to use it as the default message that appears in your editor when you run <code>git commit</code>, set the <code>commit.template</code> configuration value:</p>
|
|
783
|
-
</div>
|
|
784
|
-
<div class="listingblock">
|
|
785
|
-
<div class="content">
|
|
786
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global commit.template ~/.gitmessage.txt
|
|
787
|
-
$ git commit</code></pre>
|
|
788
|
-
</div>
|
|
789
|
-
</div>
|
|
790
|
-
<div class="paragraph">
|
|
791
|
-
<p>Then, your editor will open to something like this for your placeholder commit message when you commit:</p>
|
|
792
|
-
</div>
|
|
793
|
-
<div class="listingblock">
|
|
794
|
-
<div class="content">
|
|
795
|
-
<pre class="highlight"><code class="language-text" data-lang="text">Subject line (try to keep under 50 characters)
|
|
796
|
-
|
|
797
|
-
Multi-line description of commit,
|
|
798
|
-
feel free to be detailed.
|
|
799
|
-
|
|
800
|
-
[Ticket: X]
|
|
801
|
-
# Please enter the commit message for your changes. Lines starting
|
|
802
|
-
# with '#' will be ignored, and an empty message aborts the commit.
|
|
803
|
-
# On branch master
|
|
804
|
-
# Changes to be committed:
|
|
805
|
-
# (use "git reset HEAD <file>..." to unstage)
|
|
806
|
-
#
|
|
807
|
-
# modified: lib/test.rb
|
|
808
|
-
#
|
|
809
|
-
~
|
|
810
|
-
~
|
|
811
|
-
".git/COMMIT_EDITMSG" 14L, 297C</code></pre>
|
|
812
|
-
</div>
|
|
813
|
-
</div>
|
|
814
|
-
<div class="paragraph">
|
|
815
|
-
<p>If your team has a commit-message policy, then putting a template for that policy on your system and configuring Git to use it by default can help increase the chance of that policy being followed regularly.</p>
|
|
816
|
-
</div>
|
|
817
|
-
</div>
|
|
818
|
-
<div class="sect4">
|
|
819
|
-
<h4 id="_core_pager"><code>core.pager</code></h4>
|
|
820
|
-
<div class="paragraph">
|
|
821
|
-
<p>
|
|
822
|
-
This setting determines which pager is used when Git pages output such as <code>log</code> and <code>diff</code>.
|
|
823
|
-
You can set it to <code>more</code> or to your favorite pager (by default, it’s <code>less</code>), or you can turn it off by setting it to a blank string:</p>
|
|
824
|
-
</div>
|
|
825
|
-
<div class="listingblock">
|
|
826
|
-
<div class="content">
|
|
827
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global core.pager ''</code></pre>
|
|
828
|
-
</div>
|
|
829
|
-
</div>
|
|
830
|
-
<div class="paragraph">
|
|
831
|
-
<p>If you run that, Git will page the entire output of all commands, no matter how long they are.</p>
|
|
832
|
-
</div>
|
|
833
|
-
</div>
|
|
834
|
-
<div class="sect4">
|
|
835
|
-
<h4 id="_user_signingkey"><code>user.signingkey</code></h4>
|
|
836
|
-
<div class="paragraph">
|
|
837
|
-
<p>
|
|
838
|
-
If you’re making signed annotated tags (as discussed in <a href="_signing.html">Signing Your Work</a>), setting your GPG signing key as a configuration setting makes things easier.
|
|
839
|
-
Set your key ID like so:</p>
|
|
840
|
-
</div>
|
|
841
|
-
<div class="listingblock">
|
|
842
|
-
<div class="content">
|
|
843
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global user.signingkey <gpg-key-id></code></pre>
|
|
844
|
-
</div>
|
|
845
|
-
</div>
|
|
846
|
-
<div class="paragraph">
|
|
847
|
-
<p>Now, you can sign tags without having to specify your key every time with the <code>git tag</code> command:</p>
|
|
848
|
-
</div>
|
|
849
|
-
<div class="listingblock">
|
|
850
|
-
<div class="content">
|
|
851
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git tag -s <tag-name></code></pre>
|
|
852
|
-
</div>
|
|
853
|
-
</div>
|
|
854
|
-
</div>
|
|
855
|
-
<div class="sect4">
|
|
856
|
-
<h4 id="_core_excludesfile"><code>core.excludesfile</code></h4>
|
|
857
|
-
<div class="paragraph">
|
|
858
|
-
<p>
|
|
859
|
-
You can put patterns in your project’s <code>.gitignore</code> file to have Git not see them as untracked files or try to stage them when you run <code>git add</code> on them, as discussed in <a href="_ignoring.html">Ignoring Files</a>.</p>
|
|
860
|
-
</div>
|
|
861
|
-
<div class="paragraph">
|
|
862
|
-
<p>But sometimes you want to ignore certain files for all repositories that you work with.
|
|
863
|
-
If your computer is running macOS, you’re probably familiar with <code>.DS_Store</code> files.
|
|
864
|
-
If your preferred editor is Emacs or Vim, you know about filenames that end with a <code>~</code> or <code>.swp</code>.</p>
|
|
865
|
-
</div>
|
|
866
|
-
<div class="paragraph">
|
|
867
|
-
<p>This setting lets you write a kind of global <code>.gitignore</code> file.
|
|
868
|
-
If you create a <code>~/.gitignore_global</code> file with these contents:</p>
|
|
869
|
-
</div>
|
|
870
|
-
<div class="listingblock">
|
|
871
|
-
<div class="content">
|
|
872
|
-
<pre class="highlight"><code class="language-ini" data-lang="ini">*~
|
|
873
|
-
.*.swp
|
|
874
|
-
.DS_Store</code></pre>
|
|
875
|
-
</div>
|
|
876
|
-
</div>
|
|
877
|
-
<div class="paragraph">
|
|
878
|
-
<p>…and you run <code>git config --global core.excludesfile ~/.gitignore_global</code>, Git will never again bother you about those files.</p>
|
|
879
|
-
</div>
|
|
880
|
-
</div>
|
|
881
|
-
<div class="sect4">
|
|
882
|
-
<h4 id="_help_autocorrect"><code>help.autocorrect</code></h4>
|
|
883
|
-
<div class="paragraph">
|
|
884
|
-
<p>
|
|
885
|
-
If you mistype a command, it shows you something like this:</p>
|
|
886
|
-
</div>
|
|
887
|
-
<div class="listingblock">
|
|
888
|
-
<div class="content">
|
|
889
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git chekcout master
|
|
890
|
-
git: 'chekcout' is not a git command. See 'git --help'.
|
|
891
|
-
|
|
892
|
-
The most similar command is
|
|
893
|
-
checkout</code></pre>
|
|
894
|
-
</div>
|
|
895
|
-
</div>
|
|
896
|
-
<div class="paragraph">
|
|
897
|
-
<p>Git helpfully tries to figure out what you meant, but it still refuses to do it.
|
|
898
|
-
If you set <code>help.autocorrect</code> to 1, Git will actually run this command for you:</p>
|
|
899
|
-
</div>
|
|
900
|
-
<div class="listingblock">
|
|
901
|
-
<div class="content">
|
|
902
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git chekcout master
|
|
903
|
-
WARNING: You called a Git command named 'chekcout', which does not exist.
|
|
904
|
-
Continuing under the assumption that you meant 'checkout'
|
|
905
|
-
in 0.1 seconds automatically...</code></pre>
|
|
906
|
-
</div>
|
|
907
|
-
</div>
|
|
908
|
-
<div class="paragraph">
|
|
909
|
-
<p>Note that “0.1 seconds” business.
|
|
910
|
-
<code>help.autocorrect</code> is actually an integer which represents tenths of a second.
|
|
911
|
-
So if you set it to 50, Git will give you 5 seconds to change your mind before executing the autocorrected command.</p>
|
|
912
|
-
</div>
|
|
913
|
-
</div>
|
|
914
|
-
</div>
|
|
915
|
-
<div class="sect3">
|
|
916
|
-
<h3 id="_colors_in_git">Colors in Git</h3>
|
|
917
|
-
<div class="paragraph">
|
|
918
|
-
<p>
|
|
919
|
-
Git fully supports colored terminal output, which greatly aids in visually parsing command output quickly and easily.
|
|
920
|
-
A number of options can help you set the coloring to your preference.</p>
|
|
921
|
-
</div>
|
|
922
|
-
<div class="sect4">
|
|
923
|
-
<h4 id="_color_ui"><code>color.ui</code></h4>
|
|
924
|
-
<div class="paragraph">
|
|
925
|
-
<p>Git automatically colors most of its output, but there’s a master switch if you don’t like this behavior.
|
|
926
|
-
To turn off all Git’s colored terminal output, do this:</p>
|
|
927
|
-
</div>
|
|
928
|
-
<div class="listingblock">
|
|
929
|
-
<div class="content">
|
|
930
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global color.ui false</code></pre>
|
|
931
|
-
</div>
|
|
932
|
-
</div>
|
|
933
|
-
<div class="paragraph">
|
|
934
|
-
<p>The default setting is <code>auto</code>, which colors output when it’s going straight to a terminal, but omits the color-control codes when the output is redirected to a pipe or a file.</p>
|
|
935
|
-
</div>
|
|
936
|
-
<div class="paragraph">
|
|
937
|
-
<p>You can also set it to <code>always</code> to ignore the difference between terminals and pipes.
|
|
938
|
-
You’ll rarely want this; in most scenarios, if you want color codes in your redirected output, you can instead pass a <code>--color</code> flag to the Git command to force it to use color codes.
|
|
939
|
-
The default setting is almost always what you’ll want.</p>
|
|
940
|
-
</div>
|
|
941
|
-
</div>
|
|
942
|
-
<div class="sect4">
|
|
943
|
-
<h4 id="_color"><code>color.*</code></h4>
|
|
944
|
-
<div class="paragraph">
|
|
945
|
-
<p>If you want to be more specific about which commands are colored and how, Git provides verb-specific coloring settings.
|
|
946
|
-
Each of these can be set to <code>true</code>, <code>false</code>, or <code>always</code>:</p>
|
|
947
|
-
</div>
|
|
948
|
-
<div class="literalblock">
|
|
949
|
-
<div class="content">
|
|
950
|
-
<pre>color.branch
|
|
951
|
-
color.diff
|
|
952
|
-
color.interactive
|
|
953
|
-
color.status</pre>
|
|
954
|
-
</div>
|
|
955
|
-
</div>
|
|
956
|
-
<div class="paragraph">
|
|
957
|
-
<p>In addition, each of these has subsettings you can use to set specific colors for parts of the output, if you want to override each color.
|
|
958
|
-
For example, to set the meta information in your diff output to blue foreground, black background, and bold text, you can run:</p>
|
|
959
|
-
</div>
|
|
960
|
-
<div class="listingblock">
|
|
961
|
-
<div class="content">
|
|
962
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global color.diff.meta "blue black bold"</code></pre>
|
|
963
|
-
</div>
|
|
964
|
-
</div>
|
|
965
|
-
<div class="paragraph">
|
|
966
|
-
<p>You can set the color to any of the following values: <code>normal</code>, <code>black</code>, <code>red</code>, <code>green</code>, <code>yellow</code>, <code>blue</code>, <code>magenta</code>, <code>cyan</code>, or <code>white</code>.
|
|
967
|
-
If you want an attribute like bold in the previous example, you can choose from <code>bold</code>, <code>dim</code>, <code>ul</code> (underline), <code>blink</code>, and <code>reverse</code> (swap foreground and background).</p>
|
|
968
|
-
</div>
|
|
969
|
-
</div>
|
|
970
|
-
</div>
|
|
971
|
-
<div class="sect3">
|
|
972
|
-
<h3 id="_external_merge_tools">External Merge and Diff Tools</h3>
|
|
973
|
-
<div class="paragraph">
|
|
974
|
-
<p>
|
|
975
|
-
Although Git has an internal implementation of diff, which is what we’ve been showing in this book, you can set up an external tool instead.
|
|
976
|
-
You can also set up a graphical merge-conflict-resolution tool instead of having to resolve conflicts manually.
|
|
977
|
-
We’ll demonstrate setting up the Perforce Visual Merge Tool (P4Merge) to do your diffs and merge resolutions, because it’s a nice graphical tool and it’s free.</p>
|
|
978
|
-
</div>
|
|
979
|
-
<div class="paragraph">
|
|
980
|
-
<p>If you want to try this out, P4Merge works on all major platforms, so you should be able to do so.
|
|
981
|
-
We’ll use path names in the examples that work on macOS and Linux systems; for Windows, you’ll have to change <code>/usr/local/bin</code> to an executable path in your environment.</p>
|
|
982
|
-
</div>
|
|
983
|
-
<div class="paragraph">
|
|
984
|
-
<p>To begin, <a href="https://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools">download P4Merge from Perforce</a>.
|
|
985
|
-
Next, you’ll set up external wrapper scripts to run your commands.
|
|
986
|
-
We’ll use the macOS path for the executable; in other systems, it will be where your <code>p4merge</code> binary is installed.
|
|
987
|
-
Set up a merge wrapper script named <code>extMerge</code> that calls your binary with all the arguments provided:</p>
|
|
988
|
-
</div>
|
|
989
|
-
<div class="listingblock">
|
|
990
|
-
<div class="content">
|
|
991
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ cat /usr/local/bin/extMerge
|
|
992
|
-
#!/bin/sh
|
|
993
|
-
/Applications/p4merge.app/Contents/MacOS/p4merge $*</code></pre>
|
|
994
|
-
</div>
|
|
995
|
-
</div>
|
|
996
|
-
<div class="paragraph">
|
|
997
|
-
<p>The diff wrapper checks to make sure seven arguments are provided and passes two of them to your merge script.
|
|
998
|
-
By default, Git passes the following arguments to the diff program:</p>
|
|
999
|
-
</div>
|
|
1000
|
-
<div class="listingblock">
|
|
1001
|
-
<div class="content">
|
|
1002
|
-
<pre class="highlight"><code>path old-file old-hex old-mode new-file new-hex new-mode</code></pre>
|
|
1003
|
-
</div>
|
|
1004
|
-
</div>
|
|
1005
|
-
<div class="paragraph">
|
|
1006
|
-
<p>Because you only want the <code>old-file</code> and <code>new-file</code> arguments, you use the wrapper script to pass the ones you need.</p>
|
|
1007
|
-
</div>
|
|
1008
|
-
<div class="listingblock">
|
|
1009
|
-
<div class="content">
|
|
1010
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ cat /usr/local/bin/extDiff
|
|
1011
|
-
#!/bin/sh
|
|
1012
|
-
[ $# -eq 7 ] && /usr/local/bin/extMerge "$2" "$5"</code></pre>
|
|
1013
|
-
</div>
|
|
1014
|
-
</div>
|
|
1015
|
-
<div class="paragraph">
|
|
1016
|
-
<p>You also need to make sure these tools are executable:</p>
|
|
1017
|
-
</div>
|
|
1018
|
-
<div class="listingblock">
|
|
1019
|
-
<div class="content">
|
|
1020
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ sudo chmod +x /usr/local/bin/extMerge
|
|
1021
|
-
$ sudo chmod +x /usr/local/bin/extDiff</code></pre>
|
|
1022
|
-
</div>
|
|
1023
|
-
</div>
|
|
1024
|
-
<div class="paragraph">
|
|
1025
|
-
<p>Now you can set up your config file to use your custom merge resolution and diff tools.
|
|
1026
|
-
This takes a number of custom settings: <code>merge.tool</code> to tell Git what strategy to use, <code>mergetool.<tool>.cmd</code> to specify how to run the command, <code>mergetool.<tool>.trustExitCode</code> to tell Git if the exit code of that program indicates a successful merge resolution or not, and <code>diff.external</code> to tell Git what command to run for diffs.
|
|
1027
|
-
So, you can either run four config commands:</p>
|
|
1028
|
-
</div>
|
|
1029
|
-
<div class="listingblock">
|
|
1030
|
-
<div class="content">
|
|
1031
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global merge.tool extMerge
|
|
1032
|
-
$ git config --global mergetool.extMerge.cmd \
|
|
1033
|
-
'extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'
|
|
1034
|
-
$ git config --global mergetool.extMerge.trustExitCode false
|
|
1035
|
-
$ git config --global diff.external extDiff</code></pre>
|
|
1036
|
-
</div>
|
|
1037
|
-
</div>
|
|
1038
|
-
<div class="paragraph">
|
|
1039
|
-
<p>or you can edit your <code>~/.gitconfig</code> file to add these lines:</p>
|
|
1040
|
-
</div>
|
|
1041
|
-
<div class="listingblock">
|
|
1042
|
-
<div class="content">
|
|
1043
|
-
<pre class="highlight"><code class="language-ini" data-lang="ini">[merge]
|
|
1044
|
-
tool = extMerge
|
|
1045
|
-
[mergetool "extMerge"]
|
|
1046
|
-
cmd = extMerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
|
|
1047
|
-
trustExitCode = false
|
|
1048
|
-
[diff]
|
|
1049
|
-
external = extDiff</code></pre>
|
|
1050
|
-
</div>
|
|
1051
|
-
</div>
|
|
1052
|
-
<div class="paragraph">
|
|
1053
|
-
<p>After all this is set, if you run diff commands such as this:</p>
|
|
1054
|
-
</div>
|
|
1055
|
-
<div class="listingblock">
|
|
1056
|
-
<div class="content">
|
|
1057
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git diff 32d1776b1^ 32d1776b1</code></pre>
|
|
1058
|
-
</div>
|
|
1059
|
-
</div>
|
|
1060
|
-
<div class="paragraph">
|
|
1061
|
-
<p>Instead of getting the diff output on the command line, Git fires up P4Merge, which looks something like this:</p>
|
|
1062
|
-
</div>
|
|
1063
|
-
<div class="imageblock">
|
|
1064
|
-
<div class="content">
|
|
1065
|
-
<img src="../images/p4merge.png" alt="P4Merge">
|
|
1066
|
-
</div>
|
|
1067
|
-
<div class="title">Figure 142. P4Merge</div>
|
|
1068
|
-
</div>
|
|
1069
|
-
<div class="paragraph">
|
|
1070
|
-
<p>If you try to merge two branches and subsequently have merge conflicts, you can run the command <code>git mergetool</code>; it starts P4Merge to let you resolve the conflicts through that GUI tool.</p>
|
|
1071
|
-
</div>
|
|
1072
|
-
<div class="paragraph">
|
|
1073
|
-
<p>The nice thing about this wrapper setup is that you can change your diff and merge tools easily.
|
|
1074
|
-
For example, to change your <code>extDiff</code> and <code>extMerge</code> tools to run the KDiff3 tool instead, all you have to do is edit your <code>extMerge</code> file:</p>
|
|
1075
|
-
</div>
|
|
1076
|
-
<div class="listingblock">
|
|
1077
|
-
<div class="content">
|
|
1078
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ cat /usr/local/bin/extMerge
|
|
1079
|
-
#!/bin/sh
|
|
1080
|
-
/Applications/kdiff3.app/Contents/MacOS/kdiff3 $*</code></pre>
|
|
1081
|
-
</div>
|
|
1082
|
-
</div>
|
|
1083
|
-
<div class="paragraph">
|
|
1084
|
-
<p>Now, Git will use the KDiff3 tool for diff viewing and merge conflict resolution.</p>
|
|
1085
|
-
</div>
|
|
1086
|
-
<div class="paragraph">
|
|
1087
|
-
<p>Git comes preset to use a number of other merge-resolution tools without your having to set up the cmd configuration.
|
|
1088
|
-
To see a list of the tools it supports, try this:</p>
|
|
1089
|
-
</div>
|
|
1090
|
-
<div class="listingblock">
|
|
1091
|
-
<div class="content">
|
|
1092
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git mergetool --tool-help
|
|
1093
|
-
'git mergetool --tool=<tool>' may be set to one of the following:
|
|
1094
|
-
emerge
|
|
1095
|
-
gvimdiff
|
|
1096
|
-
gvimdiff2
|
|
1097
|
-
opendiff
|
|
1098
|
-
p4merge
|
|
1099
|
-
vimdiff
|
|
1100
|
-
vimdiff2
|
|
1101
|
-
|
|
1102
|
-
The following tools are valid, but not currently available:
|
|
1103
|
-
araxis
|
|
1104
|
-
bc3
|
|
1105
|
-
codecompare
|
|
1106
|
-
deltawalker
|
|
1107
|
-
diffmerge
|
|
1108
|
-
diffuse
|
|
1109
|
-
ecmerge
|
|
1110
|
-
kdiff3
|
|
1111
|
-
meld
|
|
1112
|
-
tkdiff
|
|
1113
|
-
tortoisemerge
|
|
1114
|
-
xxdiff
|
|
1115
|
-
|
|
1116
|
-
Some of the tools listed above only work in a windowed
|
|
1117
|
-
environment. If run in a terminal-only session, they will fail.</code></pre>
|
|
1118
|
-
</div>
|
|
1119
|
-
</div>
|
|
1120
|
-
<div class="paragraph">
|
|
1121
|
-
<p>If you’re not interested in using KDiff3 for diff but rather want to use it just for merge resolution, and the kdiff3 command is in your path, then you can run:</p>
|
|
1122
|
-
</div>
|
|
1123
|
-
<div class="listingblock">
|
|
1124
|
-
<div class="content">
|
|
1125
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global merge.tool kdiff3</code></pre>
|
|
1126
|
-
</div>
|
|
1127
|
-
</div>
|
|
1128
|
-
<div class="paragraph">
|
|
1129
|
-
<p>If you run this instead of setting up the <code>extMerge</code> and <code>extDiff</code> files, Git will use KDiff3 for merge resolution and the normal Git diff tool for diffs.</p>
|
|
1130
|
-
</div>
|
|
1131
|
-
</div>
|
|
1132
|
-
<div class="sect3">
|
|
1133
|
-
<h3 id="_formatting_and_whitespace">Formatting and Whitespace</h3>
|
|
1134
|
-
<div class="paragraph">
|
|
1135
|
-
<p>
|
|
1136
|
-
Formatting and whitespace issues are some of the more frustrating and subtle problems that many developers encounter when collaborating, especially cross-platform.
|
|
1137
|
-
It’s very easy for patches or other collaborated work to introduce subtle whitespace changes because editors silently introduce them, and if your files ever touch a Windows system, their line endings might be replaced.
|
|
1138
|
-
Git has a few configuration options to help with these issues.</p>
|
|
1139
|
-
</div>
|
|
1140
|
-
<div class="sect4">
|
|
1141
|
-
<h4 id="_core_autocrlf"><code>core.autocrlf</code></h4>
|
|
1142
|
-
<div class="paragraph">
|
|
1143
|
-
<p>
|
|
1144
|
-
If you’re programming on Windows and working with people who are not (or vice-versa), you’ll probably run into line-ending issues at some point.
|
|
1145
|
-
This is because Windows uses both a carriage-return character and a linefeed character for newlines in its files, whereas macOS and Linux systems use only the linefeed character.
|
|
1146
|
-
This is a subtle but incredibly annoying fact of cross-platform work; many editors on Windows silently replace existing LF-style line endings with CRLF, or insert both line-ending characters when the user hits the enter key.</p>
|
|
1147
|
-
</div>
|
|
1148
|
-
<div class="paragraph">
|
|
1149
|
-
<p>Git can handle this by auto-converting CRLF line endings into LF when you add a file to the index, and vice versa when it checks out code onto your filesystem.
|
|
1150
|
-
You can turn on this functionality with the <code>core.autocrlf</code> setting.
|
|
1151
|
-
If you’re on a Windows machine, set it to <code>true</code> — this converts LF endings into CRLF when you check out code:</p>
|
|
1152
|
-
</div>
|
|
1153
|
-
<div class="listingblock">
|
|
1154
|
-
<div class="content">
|
|
1155
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global core.autocrlf true</code></pre>
|
|
1156
|
-
</div>
|
|
1157
|
-
</div>
|
|
1158
|
-
<div class="paragraph">
|
|
1159
|
-
<p>If you’re on a Linux or macOS system that uses LF line endings, then you don’t want Git to automatically convert them when you check out files; however, if a file with CRLF endings accidentally gets introduced, then you may want Git to fix it.
|
|
1160
|
-
You can tell Git to convert CRLF to LF on commit but not the other way around by setting <code>core.autocrlf</code> to input:</p>
|
|
1161
|
-
</div>
|
|
1162
|
-
<div class="listingblock">
|
|
1163
|
-
<div class="content">
|
|
1164
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global core.autocrlf input</code></pre>
|
|
1165
|
-
</div>
|
|
1166
|
-
</div>
|
|
1167
|
-
<div class="paragraph">
|
|
1168
|
-
<p>This setup should leave you with CRLF endings in Windows checkouts, but LF endings on macOS and Linux systems and in the repository.</p>
|
|
1169
|
-
</div>
|
|
1170
|
-
<div class="paragraph">
|
|
1171
|
-
<p>If you’re a Windows programmer doing a Windows-only project, then you can turn off this functionality, recording the carriage returns in the repository by setting the config value to <code>false</code>:</p>
|
|
1172
|
-
</div>
|
|
1173
|
-
<div class="listingblock">
|
|
1174
|
-
<div class="content">
|
|
1175
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global core.autocrlf false</code></pre>
|
|
1176
|
-
</div>
|
|
1177
|
-
</div>
|
|
1178
|
-
</div>
|
|
1179
|
-
<div class="sect4">
|
|
1180
|
-
<h4 id="_core_whitespace"><code>core.whitespace</code></h4>
|
|
1181
|
-
<div class="paragraph">
|
|
1182
|
-
<p>Git comes preset to detect and fix some whitespace issues.
|
|
1183
|
-
It can look for six primary whitespace issues — three are enabled by default and can be turned off, and three are disabled by default but can be activated.</p>
|
|
1184
|
-
</div>
|
|
1185
|
-
<div class="paragraph">
|
|
1186
|
-
<p>The three that are turned on by default are <code>blank-at-eol</code>, which looks for spaces at the end of a line; <code>blank-at-eof</code>, which notices blank lines at the end of a file; and <code>space-before-tab</code>, which looks for spaces before tabs at the beginning of a line.</p>
|
|
1187
|
-
</div>
|
|
1188
|
-
<div class="paragraph">
|
|
1189
|
-
<p>The three that are disabled by default but can be turned on are <code>indent-with-non-tab</code>, which looks for lines that begin with spaces instead of tabs (and is controlled by the <code>tabwidth</code> option); <code>tab-in-indent</code>, which watches for tabs in the indentation portion of a line; and <code>cr-at-eol</code>, which tells Git that carriage returns at the end of lines are OK.</p>
|
|
1190
|
-
</div>
|
|
1191
|
-
<div class="paragraph">
|
|
1192
|
-
<p>You can tell Git which of these you want enabled by setting <code>core.whitespace</code> to the values you want on or off, separated by commas.
|
|
1193
|
-
You can disable an option by prepending a <code>-</code> in front of its name, or use the default value by leaving it out of the setting string entirely.
|
|
1194
|
-
For example, if you want all but <code>space-before-tab</code> to be set, you can do this (with <code>trailing-space</code> being a short-hand to cover both <code>blank-at-eol</code> and <code>blank-at-eof</code>):</p>
|
|
1195
|
-
</div>
|
|
1196
|
-
<div class="listingblock">
|
|
1197
|
-
<div class="content">
|
|
1198
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global core.whitespace \
|
|
1199
|
-
trailing-space,-space-before-tab,indent-with-non-tab,tab-in-indent,cr-at-eol</code></pre>
|
|
1200
|
-
</div>
|
|
1201
|
-
</div>
|
|
1202
|
-
<div class="paragraph">
|
|
1203
|
-
<p>Or you can specify the customizing part only:</p>
|
|
1204
|
-
</div>
|
|
1205
|
-
<div class="listingblock">
|
|
1206
|
-
<div class="content">
|
|
1207
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --global core.whitespace \
|
|
1208
|
-
-space-before-tab,indent-with-non-tab,tab-in-indent,cr-at-eol</code></pre>
|
|
1209
|
-
</div>
|
|
1210
|
-
</div>
|
|
1211
|
-
<div class="paragraph">
|
|
1212
|
-
<p>Git will detect these issues when you run a <code>git diff</code> command and try to color them so you can possibly fix them before you commit.
|
|
1213
|
-
It will also use these values to help you when you apply patches with <code>git apply</code>.
|
|
1214
|
-
When you’re applying patches, you can ask Git to warn you if it’s applying patches with the specified whitespace issues:</p>
|
|
1215
|
-
</div>
|
|
1216
|
-
<div class="listingblock">
|
|
1217
|
-
<div class="content">
|
|
1218
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git apply --whitespace=warn <patch></code></pre>
|
|
1219
|
-
</div>
|
|
1220
|
-
</div>
|
|
1221
|
-
<div class="paragraph">
|
|
1222
|
-
<p>Or you can have Git try to automatically fix the issue before applying the patch:</p>
|
|
1223
|
-
</div>
|
|
1224
|
-
<div class="listingblock">
|
|
1225
|
-
<div class="content">
|
|
1226
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git apply --whitespace=fix <patch></code></pre>
|
|
1227
|
-
</div>
|
|
1228
|
-
</div>
|
|
1229
|
-
<div class="paragraph">
|
|
1230
|
-
<p>These options apply to the <code>git rebase</code> command as well.
|
|
1231
|
-
If you’ve committed whitespace issues but haven’t yet pushed upstream, you can run <code>git rebase --whitespace=fix</code> to have Git automatically fix whitespace issues as it’s rewriting the patches.</p>
|
|
1232
|
-
</div>
|
|
1233
|
-
</div>
|
|
1234
|
-
</div>
|
|
1235
|
-
<div class="sect3">
|
|
1236
|
-
<h3 id="_server_configuration">Server Configuration</h3>
|
|
1237
|
-
<div class="paragraph">
|
|
1238
|
-
<p>Not nearly as many configuration options are available for the server side of Git, but there are a few interesting ones you may want to take note of.</p>
|
|
1239
|
-
</div>
|
|
1240
|
-
<div class="sect4">
|
|
1241
|
-
<h4 id="_receive_fsckobjects"><code>receive.fsckObjects</code></h4>
|
|
1242
|
-
<div class="paragraph">
|
|
1243
|
-
<p>Git is capable of making sure every object received during a push still matches its SHA-1 checksum and points to valid objects.
|
|
1244
|
-
However, it doesn’t do this by default; it’s a fairly expensive operation, and might slow down the operation, especially on large repositories or pushes.
|
|
1245
|
-
If you want Git to check object consistency on every push, you can force it to do so by setting <code>receive.fsckObjects</code> to true:</p>
|
|
1246
|
-
</div>
|
|
1247
|
-
<div class="listingblock">
|
|
1248
|
-
<div class="content">
|
|
1249
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --system receive.fsckObjects true</code></pre>
|
|
1250
|
-
</div>
|
|
1251
|
-
</div>
|
|
1252
|
-
<div class="paragraph">
|
|
1253
|
-
<p>Now, Git will check the integrity of your repository before each push is accepted to make sure faulty (or malicious) clients aren’t introducing corrupt data.</p>
|
|
1254
|
-
</div>
|
|
1255
|
-
</div>
|
|
1256
|
-
<div class="sect4">
|
|
1257
|
-
<h4 id="_receive_denynonfastforwards"><code>receive.denyNonFastForwards</code></h4>
|
|
1258
|
-
<div class="paragraph">
|
|
1259
|
-
<p>If you rebase commits that you’ve already pushed and then try to push again, or otherwise try to push a commit to a remote branch that doesn’t contain the commit that the remote branch currently points to, you’ll be denied.
|
|
1260
|
-
This is generally good policy; but in the case of the rebase, you may determine that you know what you’re doing and can force-update the remote branch with a <code>-f</code> flag to your push command.</p>
|
|
1261
|
-
</div>
|
|
1262
|
-
<div class="paragraph">
|
|
1263
|
-
<p>To tell Git to refuse force-pushes, set <code>receive.denyNonFastForwards</code>:</p>
|
|
1264
|
-
</div>
|
|
1265
|
-
<div class="listingblock">
|
|
1266
|
-
<div class="content">
|
|
1267
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --system receive.denyNonFastForwards true</code></pre>
|
|
1268
|
-
</div>
|
|
1269
|
-
</div>
|
|
1270
|
-
<div class="paragraph">
|
|
1271
|
-
<p>The other way you can do this is via server-side receive hooks, which we’ll cover in a bit.
|
|
1272
|
-
That approach lets you do more complex things like deny non-fast-forwards to a certain subset of users.</p>
|
|
1273
|
-
</div>
|
|
1274
|
-
</div>
|
|
1275
|
-
<div class="sect4">
|
|
1276
|
-
<h4 id="_receive_denydeletes"><code>receive.denyDeletes</code></h4>
|
|
1277
|
-
<div class="paragraph">
|
|
1278
|
-
<p>One of the workarounds to the <code>denyNonFastForwards</code> policy is for the user to delete the branch and then push it back up with the new reference.
|
|
1279
|
-
To avoid this, set <code>receive.denyDeletes</code> to true:</p>
|
|
1280
|
-
</div>
|
|
1281
|
-
<div class="listingblock">
|
|
1282
|
-
<div class="content">
|
|
1283
|
-
<pre class="highlight"><code class="language-console" data-lang="console">$ git config --system receive.denyDeletes true</code></pre>
|
|
1284
|
-
</div>
|
|
1285
|
-
</div>
|
|
1286
|
-
<div class="paragraph">
|
|
1287
|
-
<p>This denies any deletion of branches or tags — no user can do it.
|
|
1288
|
-
To remove remote branches, you must remove the ref files from the server manually.
|
|
1289
|
-
There are also more interesting ways to do this on a per-user basis via ACLs, as you’ll learn in <a href="_an_example_git_enforced_policy.html">An Example Git-Enforced Policy</a>.</p>
|
|
1290
|
-
</div>
|
|
1291
|
-
</div>
|
|
1292
|
-
</div>
|
|
1293
|
-
<div id="nav"><a href="../Git-Tools-Summary.html">prev</a> | <a href="_keyword_expansion.html">next</a></div></div>
|
|
1294
|
-
</div>
|
|
1295
|
-
|
|
1296
|
-
</div>
|
|
1297
|
-
</div>
|
|
1298
|
-
<footer>
|
|
1299
|
-
<div class="site-source">
|
|
1300
|
-
<a href="https://git-scm.com/site">About this site</a><br>
|
|
1301
|
-
Patches, suggestions, and comments are welcome.
|
|
1302
|
-
</div>
|
|
1303
|
-
<div class="sfc-member">
|
|
1304
|
-
Git is a member of <a href="https://git-scm.com/sfc">Software Freedom Conservancy</a>
|
|
1305
|
-
</div>
|
|
1306
|
-
</footer>
|
|
1307
|
-
<a href="_external_merge_tools.html#top" class="no-js scrollToTop" id="scrollToTop" data-label="Scroll to top">
|
|
1308
|
-
<img src="../../../../images/icons/chevron-up@2x.png" width="20" height="20" alt="scroll-to-top"/>
|
|
1309
|
-
</a>
|
|
1310
|
-
<script src="../../../../assets/application-38b0d42ff05ffea45841edebbd14b75b89585646153808e82907c2c5c11f324b.js"></script>
|
|
1311
|
-
|
|
1312
|
-
</div>
|
|
1313
|
-
|
|
1314
|
-
</body>
|
|
1315
|
-
</html>
|