Skip to content

Commit 58c09cc

Browse files
committed
Merge branch 'progit:master' into patch-2
2 parents f6e43a8 + 05d3306 commit 58c09cc

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

Gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
source 'https://rubygems.org'
22

33
gem 'rake', '13.0.3'
4-
gem 'asciidoctor', '2.0.12'
4+
gem 'asciidoctor', '2.0.15'
55

66
gem 'json', '2.5.1'
7-
gem 'awesome_print', '1.8.0'
7+
gem 'awesome_print', '1.9.2'
88

99
gem 'asciidoctor-epub3', '1.5.0.alpha.19'
1010
gem 'asciidoctor-pdf', '1.5.4'
1111

1212
gem 'coderay', '1.1.3'
13-
gem 'pygments.rb', '2.1.0'
13+
gem 'pygments.rb', '2.2.0'
1414
gem 'thread_safe', '0.3.6'
15-
gem 'epubcheck-ruby', '4.2.4.0'
16-
gem 'html-proofer', '3.18.8'
15+
gem 'epubcheck-ruby', '4.2.5.0'
16+
gem 'html-proofer', '3.19.0'

book/01-introduction/sections/installing.asc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ A macOS Git installer is maintained and available for download at the Git websit
5151
.Git macOS Installer
5252
image::images/git-osx-installer.png[Git macOS installer]
5353

54-
You can also install it as part of the GitHub for macOS install.
55-
Their GUI Git tool has an option to install command line tools as well.
56-
You can download that tool from the GitHub for macOS website, at https://desktop.github.com[].
57-
5854
==== Installing on Windows
5955

6056
There are also a few ways to install Git on Windows.(((Windows, installing)))
@@ -65,12 +61,6 @@ Note that this is a project called Git for Windows, which is separate from Git i
6561
To get an automated installation you can use the https://chocolatey.org/packages/git[Git Chocolatey package].
6662
Note that the Chocolatey package is community maintained.
6763

68-
Another easy way to get Git installed is by installing GitHub Desktop.
69-
The installer includes a command line version of Git as well as the GUI.
70-
It also works well with PowerShell, and sets up solid credential caching and sane CRLF settings.(((PowerShell)))(((CRLF)))(((credential caching)))
71-
We'll learn more about those things a little later, but suffice it to say they're things you want.
72-
You can download this from the https://desktop.github.com[GitHub Desktop website].
73-
7464
==== Installing from Source
7565

7666
Some people may instead find it useful to install Git from source, because you'll get the most recent version.

0 commit comments

Comments
 (0)