Skip to content

Commit 179a2ce

Browse files
committed
update shell output to console lexer
This is a follow-up to 3275991. All shell output that were not updated with that commit get updated with this pull request. Please close this if those `[source,shell]` were unchanged on purpose.
1 parent 73afd56 commit 179a2ce

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

book/06-github/sections/2-contributing.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The only problem is that the blinking rate is too fast, we think it's much nicer
5858

5959
First, we click the 'Fork' button as mentioned earlier to get our own copy of the project. Our user name here is ``tonychacon'' so our copy of this project is at `https://github.com/tonychacon/blink` and that's where we can edit it. We will clone it locally, create a topic branch, make the code change and finally push that change back up to GitHub.
6060

61-
[source,shell]
61+
[source,console]
6262
----
6363
$ git clone https://github.com/tonychacon/blink <1>
6464
Cloning into 'blink'...
@@ -201,7 +201,7 @@ If you want to merge in the target branch to make your Pull Request mergeable, y
201201

202202
For example, let's say that in the ``tonychacon'' example we were using before, the original author made a change that would create a conflict in the Pull Request. Let's go through those steps.
203203

204-
[source,shell]
204+
[source,console]
205205
----
206206
$ git remote add upstream https://github.com/schacon/blink <1>
207207

book/06-github/sections/3-maintaining.asc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ If you notice the line that says `git pull <url> patch-1`, this is a simple way
7777

7878
The other interesting URLs are the `.diff` and `.patch` URLs, which as you may guess, provide unified diff and patch versions of the Pull Request. You could technically merge in the Pull Request work with something like this:
7979

80-
[source,shell]
80+
[source,console]
8181
----
8282
$ curl http://github.com/tonychacon/fade/pull/1.patch | git am
8383
----
@@ -112,7 +112,7 @@ To demonstrate this, we're going to use a low-level command (often referred to a
112112

113113
If we run this command against the ``blink'' repository we were using earlier, we will get a list of all the branches and tags and other references in the repository.
114114

115-
[source,shell]
115+
[source,console]
116116
----
117117
$ git ls-remote https://github.com/schacon/blink
118118
10d539600d86723087810ec636870a504f4fee4d HEAD
@@ -133,7 +133,7 @@ There are two references per Pull Request - the one that ends in `/head` points
133133

134134
Now, you could do something like fetching the reference directly.
135135

136-
[source,shell]
136+
[source,console]
137137
----
138138
$ git fetch origin refs/pull/958/head
139139
From https://github.com/libgit2/libgit2
@@ -170,7 +170,7 @@ You can modify this section to add another refspec:
170170
That last line tells Git, ``All the refs that look like `refs/pull/123/head` should be stored locally like `refs/remotes/origin/pr/123`.''
171171
Now, if you save that file, and do a `git fetch`:
172172

173-
[source,shell]
173+
[source,console]
174174
----
175175
$ git fetch
176176
# …
@@ -183,7 +183,7 @@ $ git fetch
183183
Now all of the remote pull requests are represented locally with refs that act much like tracking branches; they're read-only, and they update when you do a fetch.
184184
This makes it super easy to try the code from a pull request locally:
185185

186-
[source,shell]
186+
[source,console]
187187
----
188188
$ git checkout pr/2
189189
Checking out files: 100% (3769/3769), done.

book/B-embedding-git/sections/jgit.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Once this step is done, Maven will automatically acquire and use the JGit librar
2525
If you would rather manage the binary dependencies yourself, pre-built JGit binaries are available from http://www.eclipse.org/jgit/download[].
2626
You can build them into your project by running a command like this:
2727

28-
[source,shell]
28+
[source,console]
2929
----
3030
javac -cp .:org.eclipse.jgit-3.5.0.201409260305-r.jar App.java
3131
java -cp .:org.eclipse.jgit-3.5.0.201409260305-r.jar App

0 commit comments

Comments
 (0)