Skip to content

Commit 672e771

Browse files
author
ttaylorr
committed
book: update en
Updated via the `update-book.yml` GitHub workflow.
1 parent b989dd1 commit 672e771

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

external/book/content/book/en/v2/Git-Branching-Remote-Branches.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,6 @@ <h3 id="_pulling">Pulling</h3>
307307
However, there is a command called <code>git pull</code> which is essentially a <code>git fetch</code> immediately followed by a <code>git merge</code> in most cases.
308308
If you have a tracking branch set up as demonstrated in the last section, either by explicitly setting it or by having it created for you by the <code>clone</code> or <code>checkout</code> commands, <code>git pull</code> will look up what server and branch your current branch is tracking, fetch from that server and then try to merge in that remote branch.</p>
309309
</div>
310-
<div class="paragraph">
311-
<p>Generally it’s better to simply use the <code>fetch</code> and <code>merge</code> commands explicitly as the magic of <code>git pull</code> can often be confusing.</p>
312-
</div>
313310
</div>
314311
<div class="sect3">
315312
<h3 id="_delete_branches">Deleting Remote Branches</h3>

external/book/content/book/en/v2/_index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
language_code: en
99
front_page: true
1010
repository_url: https://github.com/progit/progit2
11-
sha: 515e4e11c94d1bf30d21511a85743c159d120dc7
12-
ebook_pdf: https://github.com/progit/progit2/releases/download/2.1.442/progit.pdf
13-
ebook_epub: https://github.com/progit/progit2/releases/download/2.1.442/progit.epub
14-
ebook_mobi: https://github.com/progit/progit2/releases/download/2.1.442/progit.mobi
11+
sha: 3404a4f5e0c1faab3e89ae93d48663413b31dd8d
12+
ebook_pdf: https://github.com/progit/progit2/releases/download/2.1.443/progit.pdf
13+
ebook_epub: https://github.com/progit/progit2/releases/download/2.1.443/progit.epub
14+
ebook_mobi: https://github.com/progit/progit2/releases/download/2.1.443/progit.mobi
1515
page_title: Git - Book
1616
url: "/book/en/v2.html"
1717
aliases:

external/book/sync/book-en.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
515e4e11c94d1bf30d21511a85743c159d120dc7
1+
3404a4f5e0c1faab3e89ae93d48663413b31dd8d

0 commit comments

Comments
 (0)