Total Resurrection

.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

@@ -9,3 +9,4 @@ 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

@@ -1,6 +1,6 @@
 [bugtraq]
 	url = https://github.com/progit/progit2/issues/%BUGID%
-	logregex = "[Ii]ssues?:?(\\s*(,|and)?\\s*#?\\d+)+\n(\\d+)"
+	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,20 +1,23 @@
 language: ruby
+git:
+  depth: false
 cache: bundler
 before_install:
-- gem install bundler
 - bundle install
 after_success:
 - script/tag_on_master
 script: bundle exec rake book:build
 env:
   secure: "O+YCTDgLfCYAJjjOv2sApDRV5NJe6pkhiYIkORFuf2flO8HE72fEtDRpSWh1vulnIH6AjRK2jH7C8qA3MVbUO8D0io+Ha+vnbMXIp1JPCptcJNEkJrW13VTR66SWOzsgLp3mCrIC+YdE2JoYWGcnDsRMQwdnrWnxBzSOd22ZKzU="
 
+before_deploy: bundle install && bundle exec rake book:build
 deploy:
   provider: releases
   file:
   - progit.epub
   - progit.mobi
   - progit.pdf
+  - progit.html
   skip_cleanup: true
   on:
     tags: true
@@ -28,4 +31,4 @@ branches:
 notifications:
   email:
     on_success: never
-    on_failure: always
+    on_failure: always

book/A-git-in-other-environments/1-git-other-environments.asc → A-git-in-other-environments.asc

@@ -1,3 +1,4 @@
+[[A-git-in-other-environments]]
 [appendix]
 == Git in Other Environments
 
@@ -6,18 +7,23 @@ You can work with local files, connect your repository to others over a network,
 But the story doesn't end there; Git is usually used as part of a larger ecosystem, and the terminal isn't always the best way to work with it.
 Now we'll take a look at some of the other kinds of environments where Git can be useful, and how other applications (including yours) work alongside Git.
 
-include::sections/guis.asc[]
+include::book/A-git-in-other-environments/sections/guis.asc[]
 
-include::sections/visualstudio.asc[]
+include::book/A-git-in-other-environments/sections/visualstudio.asc[]
 
-include::sections/eclipse.asc[]
+include::book/A-git-in-other-environments/sections/visualstudiocode.asc[]
 
+include::book/A-git-in-other-environments/sections/eclipse.asc[]
 
-include::sections/bash.asc[]
+include::book/A-git-in-other-environments/sections/jetbrainsides.asc[]
 
-include::sections/zsh.asc[]
+include::book/A-git-in-other-environments/sections/sublimetext.asc[]
 
-include::sections/powershell.asc[]
+include::book/A-git-in-other-environments/sections/bash.asc[]
+
+include::book/A-git-in-other-environments/sections/zsh.asc[]
+
+include::book/A-git-in-other-environments/sections/powershell.asc[]
 
 === Summary
 

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

@@ -0,0 +1,20 @@
+[[B-embedding-git-in-your-applications]]
+[appendix]
+== Embedding Git in your Applications
+
+If your application is for developers, chances are good that it could benefit from integration with source control.
+Even non-developer applications, such as document editors, could potentially benefit from version-control features, and Git's model works very well for many different scenarios.
+
+If you need to integrate Git with your application, you have essentially two options: spawn a shell and call the `git` command-line program, or embed a Git library into your application.
+Here we'll cover command-line integration and several of the most popular embeddable Git libraries.
+
+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[]
+