Skip to content

Commit 0ee802f

Browse files
hjavadishhjavadish
authored
Merge pull request #23 from MYDavoodeh/master
Total Resurrection
2 parents 91a7004 + 5346c88 commit 0ee802f

File tree

351 files changed

+14187
-2613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

351 files changed

+14187
-2613
lines changed

Diff for: ‎.dependabot/config.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
version: 1
2+
update_configs:
3+
# Update your Gemfile (& lockfiles) as soon as
4+
# new versions are published to the RubyGems registry
5+
- package_manager: "ruby:bundler"
6+
directory: "/"
7+
update_schedule: "live"
8+
9+
# Apply default reviewer and label to created
10+
# pull requests
11+
default_reviewers:
12+
- "ben"
13+
default_labels:
14+
- "dependabot"

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.md

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!-- Before filing a bug please check the following: -->
11+
<!-- * There's no existing/similar bug report. -->
12+
<!-- * This bug report is about a single actionable bug. -->
13+
<!-- * This bug is about the Pro Git book, version 2, English language. -->
14+
<!-- * This bug is about the book as found on the [website](https://www.git-scm.com/book/en/v2) or the pdf. -->
15+
<!-- * 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). -->
16+
<!-- * 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) -->
17+
<!-- * 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) -->
18+
<!-- * 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) -->
19+
<!-- * 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). -->
20+
21+
**Which version of the book is affected?**
22+
<!-- It's important for us to know if the problem is in the source or in the tooling for the pdf/epub/mobi files. -->
23+
<!-- Therefore, please write whether the problem is with the files, the online book, or both. -->
24+
25+
**Describe the bug:**
26+
<!-- A clear and concise description of what the bug is. -->
27+
28+
**Steps to reproduce:**
29+
<!-- Please write the steps needed to reproduce the bug here. -->
30+
<!-- 1. Go to '...' -->
31+
<!-- 2. Click on '....' -->
32+
<!-- 3. Scroll down to '....' -->
33+
<!-- 4. See error -->
34+
35+
**Expected behavior:**
36+
<!-- A clear and concise description of what you expected to happen. -->
37+
38+
**Screenshots:**
39+
<!-- If applicable, add screenshots to help explain your problem. -->
40+
41+
**Additional context:**
42+
<!-- Add any other context about the problem here. -->
43+
<!-- You can also put references to similar bugs here. -->
44+
45+
**Desktop:**
46+
<!-- If you've used a desktop/laptop to access the content, please fill in this form. -->
47+
<!-- Example: Windows 10 Home Edition, Firefox, version 66.0.2 -->
48+
- Operating system:
49+
- Browser/application:
50+
- Browser/application version:
51+
52+
**Smartphone:**
53+
<!-- If you've used a smartphone to access the content, please fill in this form. -->
54+
<!-- Example: iPhone 6, iOS 12.2, Safari, version 22 -->
55+
- Device:
56+
- OS:
57+
- Browser/application:
58+
- Browser/application version:
59+
60+
**E-book reader:**
61+
<!-- If you've used a e-book reader to access the content, please fill in this form. -->
62+
<!-- Example: Amazon Kindle Paperwhite 10th generation, software update 5.11.1 -->
63+
- Device:
64+
- Software Update:

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ progit.pdfmarks
99
progit.epub
1010
progit-kf8.epub
1111
progit.mobi
12+
contributors.txt

Diff for: ‎.mailmap

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

Diff for: ‎.tgitconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[bugtraq]
22
url = https://github.com/progit/progit2/issues/%BUGID%
3-
logregex = "[Ii]ssues?:?(\\s*(,|and)?\\s*#?\\d+)+\n(\\d+)"
3+
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+)"
44

55
[tgit]
66
icon = Pro.ico

Diff for: ‎.travis.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
language: ruby
2+
git:
3+
depth: false
24
cache: bundler
35
before_install:
4-
- gem install bundler
56
- bundle install
67
after_success:
78
- script/tag_on_master
89
script: bundle exec rake book:build
910
env:
1011
secure: "O+YCTDgLfCYAJjjOv2sApDRV5NJe6pkhiYIkORFuf2flO8HE72fEtDRpSWh1vulnIH6AjRK2jH7C8qA3MVbUO8D0io+Ha+vnbMXIp1JPCptcJNEkJrW13VTR66SWOzsgLp3mCrIC+YdE2JoYWGcnDsRMQwdnrWnxBzSOd22ZKzU="
1112

13+
before_deploy: bundle install && bundle exec rake book:build
1214
deploy:
1315
provider: releases
1416
file:
1517
- progit.epub
1618
- progit.mobi
1719
- progit.pdf
20+
- progit.html
1821
skip_cleanup: true
1922
on:
2023
tags: true
@@ -28,4 +31,4 @@ branches:
2831
notifications:
2932
email:
3033
on_success: never
31-
on_failure: always
34+
on_failure: always

Diff for: ‎book/A-git-in-other-environments/1-git-other-environments.asc renamed to ‎A-git-in-other-environments.asc

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[[A-git-in-other-environments]]
12
[appendix]
23
== Git in Other Environments
34

@@ -6,18 +7,23 @@ You can work with local files, connect your repository to others over a network,
67
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.
78
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.
89

9-
include::sections/guis.asc[]
10+
include::book/A-git-in-other-environments/sections/guis.asc[]
1011

11-
include::sections/visualstudio.asc[]
12+
include::book/A-git-in-other-environments/sections/visualstudio.asc[]
1213

13-
include::sections/eclipse.asc[]
14+
include::book/A-git-in-other-environments/sections/visualstudiocode.asc[]
1415

16+
include::book/A-git-in-other-environments/sections/eclipse.asc[]
1517

16-
include::sections/bash.asc[]
18+
include::book/A-git-in-other-environments/sections/jetbrainsides.asc[]
1719

18-
include::sections/zsh.asc[]
20+
include::book/A-git-in-other-environments/sections/sublimetext.asc[]
1921

20-
include::sections/powershell.asc[]
22+
include::book/A-git-in-other-environments/sections/bash.asc[]
23+
24+
include::book/A-git-in-other-environments/sections/zsh.asc[]
25+
26+
include::book/A-git-in-other-environments/sections/powershell.asc[]
2127

2228
=== Summary
2329

Diff for: ‎B-embedding-git-in-your-applications.asc

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[[B-embedding-git-in-your-applications]]
2+
[appendix]
3+
== Embedding Git in your Applications
4+
5+
If your application is for developers, chances are good that it could benefit from integration with source control.
6+
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.
7+
8+
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.
9+
Here we'll cover command-line integration and several of the most popular embeddable Git libraries.
10+
11+
include::book/B-embedding-git/sections/command-line.asc[]
12+
13+
include::book/B-embedding-git/sections/libgit2.asc[]
14+
15+
include::book/B-embedding-git/sections/jgit.asc[]
16+
17+
include::book/B-embedding-git/sections/go-git.asc[]
18+
19+
include::book/B-embedding-git/sections/dulwich.asc[]
20+

0 commit comments

Comments
 (0)