Merge remote-tracking branch 'progit/master' into sync

Author: OlingCat

.dependabot/config.yml

@@ -0,0 +1,14 @@
+version: 1
+update_configs:
+  # Update your Gemfile (& lockfiles) as soon as
+  # new versions are published to the RubyGems registry
+  - package_manager: "ruby:bundler"
+    directory: "/"
+    update_schedule: "live"
+
+    # Apply default reviewer and label to created
+    # pull requests
+    default_reviewers:
+      - "ben"
+    default_labels:
+      - "dependabot"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,64 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Before filing a bug please check the following: -->
+<!-- * There's no existing/similar bug report. -->
+<!-- * This bug report is about a single actionable bug. -->
+<!-- * This bug is about the Pro Git book, version 2, English language. -->
+<!-- * This bug is about the book as found on the [website](https://www.git-scm.com/book/en/v2) or the pdf. -->
+<!-- * If you found a issue in the pdf/epub/mobi files, you've checked if the problem is also present in the Pro Git book on the [website](https://www.git-scm.com/book/en/v2). -->
+<!-- * This bug is **not** about a translation, if so please file a bug with the translation project. You can find a table of translation projects here: [progit2/TRANSLATING.md](https://github.com/progit/progit2/blob/master/TRANSLATING.md) -->
+<!-- * This bug is **not** about the git-scm.com site, if so please file a bug here: [git-scm.com/issues/new](https://github.com/git/git-scm.com/issues/new) -->
+<!-- * This bug is **not** about git the program itself, if so please file a bug here: [git-scm.com/community](https://git-scm.com/community) -->
+<!-- * This bug is **not** about Git for Windows, if so please file a bug here: [git-for-windows/git](https://github.com/git-for-windows/git). -->
+
+**Which version of the book is affected?**
+<!-- It's important for us to know if the problem is in the source or in the tooling for the pdf/epub/mobi files. -->
+<!-- Therefore, please write whether the problem is with the files, the online book, or both. -->
+
+**Describe the bug:**
+<!-- A clear and concise description of what the bug is. -->
+
+**Steps to reproduce:**
+<!-- Please write the steps needed to reproduce the bug here. -->
+<!-- 1. Go to '...' -->
+<!-- 2. Click on '....' -->
+<!-- 3. Scroll down to '....' -->
+<!-- 4. See error -->
+
+**Expected behavior:**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Screenshots:**
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**Additional context:**
+<!-- Add any other context about the problem here. -->
+<!-- You can also put references to similar bugs here. -->
+
+**Desktop:**
+<!-- If you've used a desktop/laptop to access the content, please fill in this form. -->
+<!-- Example: Windows 10 Home Edition, Firefox, version 66.0.2 -->
+- Operating system:
+- Browser/application:
+- Browser/application version:
+
+**Smartphone:**
+<!-- If you've used a smartphone to access the content, please fill in this form. -->
+<!-- Example: iPhone 6, iOS 12.2, Safari, version 22 -->
+- Device:
+- OS:
+- Browser/application:
+- Browser/application version:
+
+**E-book reader:**
+<!-- If you've used a e-book reader to access the content, please fill in this form. -->
+<!-- Example: Amazon Kindle Paperwhite 10th generation, software update 5.11.1 -->
+- Device:
+- Software Update:

.gitignore

@@ -2,10 +2,11 @@ output
 .DS_Store
 
 # build artifacts
+Gemfile.lock
 progit.html
 progit.pdf
 progit.pdfmarks
 progit.epub
 progit-kf8.epub
 progit.mobi
-
+contributors.txt

.mailmap

@@ -0,0 +1,2 @@
+Jean-Noël Avila <[email protected]>
+Scott Chacon <[email protected]>

.tgitconfig

@@ -0,0 +1,6 @@
+[bugtraq]
+	url = https://github.com/progit/progit2/issues/%BUGID%
+	logregex = "(?:[Cc]lose[sd]?|[Ff]ix(?:e[sd])?|[Rr]esolve[sd]?):?\\s+(?:[Ii]ssues?\\s+#?|#)\\d+(?:(?:,|\\s+and)\\s+(?:[Ii]ssues?\\s+#?|#)\\d+)*\n(\\d+)"
+
+[tgit]
+	icon = Pro.ico

.travis.yml

@@ -1,33 +1,32 @@
 language: ruby
-sudo: false
 git:
   depth: false
 cache: bundler
 before_install:
- - wget https://raw.githubusercontent.com/progit/progit2-pub/master/bootstrap.sh
- - sh bootstrap.sh
+- bundle install
+after_success:
+- script/tag_on_master
 script: bundle exec rake book:build
-after_success: bundle exec rake book:tag
+env:
+  secure: "O+YCTDgLfCYAJjjOv2sApDRV5NJe6pkhiYIkORFuf2flO8HE72fEtDRpSWh1vulnIH6AjRK2jH7C8qA3MVbUO8D0io+Ha+vnbMXIp1JPCptcJNEkJrW13VTR66SWOzsgLp3mCrIC+YdE2JoYWGcnDsRMQwdnrWnxBzSOd22ZKzU="
+
+before_deploy: bundle install && bundle exec rake book:build
 deploy:
   provider: releases
-  file_glob: true
   file:
-  - progit*.epub
-  - progit*.mobi
-  - progit*.pdf
+  - progit.epub
+  - progit.mobi
+  - progit.pdf
   skip_cleanup: true
   on:
     tags: true
-  api-key: $GITHUB_API_TOKEN
+  api-key:
+    secure: "l3XdupX6dT48IoTieJXrd7Yx8+KhiR2QYrNrDzT6RKxA7UyXGSP/axsVerg7OjKfIHWZgDJRVzcc2RswE+Xjw9sOY8r2h2q9uCwj8G0EqtFbtgGK0La5LB0euh0tNJN8GLFj1OdSZGY7dWWK88GXeHCua2WSify0V79R4ClIM+s="
 branches:
   only:
   - master
   - /^2\.1(\.\d+)+$/
 
-addons:
-  apt:
-    packages:
-      - epubcheck
 notifications:
   email:
     on_success: never

A-git-in-other-environments.asc

@@ -1,18 +1,24 @@
-[#A-git-in-other-environments]
+[[A-git-in-other-environments]]
 [appendix]
-== 其它环境中的 Git
+== 在其它环境中使用 Git
 
-从头至尾读到了这里，你肯定已经掌握了不少使用 Git 命令行操作的知识。
-你学会了操作本地文件，通过网络连接你的仓库，以及与他人进行有效率的合作。
-但是故事并未就此结束；Git 通常只是更大的生态圈的一部分，在某些情况下使用终端并不是最合适的方式。
-现在就让我们来了解一下如何在其它类型的环境中更好地使用 Git，以及别的应用（包括你的）如何与 Git 进行协作。
+如果你读完了本书，那就已经掌握了很多在命令行中使用 Git 的知识了。
+你可以用它来处理本地文件，通过网络连接到他人的仓库，以及高效地与他人协同工作。
+不过故事到这儿还没结束。Git 通常还会作为一个组件在更大的生态系统中使用，
+而终端并不总是最佳的使用方式。现在我们来看看 Git 在其它环境中的使用，
+以及其它应用（包括你的应用）是如何与 Git 协同使用的。
 
 include::book/A-git-in-other-environments/sections/guis.asc[]
 
 include::book/A-git-in-other-environments/sections/visualstudio.asc[]
 
+include::book/A-git-in-other-environments/sections/visualstudiocode.asc[]
+
 include::book/A-git-in-other-environments/sections/eclipse.asc[]
 
+include::book/A-git-in-other-environments/sections/jetbrainsides.asc[]
+
+include::book/A-git-in-other-environments/sections/sublimetext.asc[]
 
 include::book/A-git-in-other-environments/sections/bash.asc[]
 
@@ -22,4 +28,4 @@ include::book/A-git-in-other-environments/sections/powershell.asc[]
 
 === 总结
 
-你已经学会了如何从日常工具中发挥 Git 的强大力量，以及从自己的程序中访问 Git 仓库的方法。
+现在你已经学会如何在日常使用的工具中驾驭强大的 Git，以及如何在自己的程序中访问 Git 仓库了。

B-embedding-git-in-your-applications.asc

@@ -0,0 +1,19 @@
+[[B-embedding-git-in-your-applications]]
+[appendix]
+== 在你的应用中嵌入 Git
+
+如果你的应用程序的目标用户是开发者，那么在其中集成源码控制功能会让他们从中受益。
+甚至对于文档编辑器等并非面向程序员的应用，也可以从版本控制系统中受益，Git 的工作模式在多种场景下表现得都非常出色。
+
+如果你想将 Git 整合进你的应用程序，那么通常有两种可行的选择：启动 shell 来调用 Git 的命令行程序，或者将 Git 库嵌入到你的应用中。
+
+include::book/B-embedding-git/sections/command-line.asc[]
+
+include::book/B-embedding-git/sections/libgit2.asc[]
+
+include::book/B-embedding-git/sections/jgit.asc[]
+
+include::book/B-embedding-git/sections/go-git.asc[]
+
+include::book/B-embedding-git/sections/dulwich.asc[]
+