Skip to content

Commit

Permalink
book: update en
Browse files Browse the repository at this point in the history
Updated via the `update-book.yml` GitHub workflow.
  • Loading branch information
ttaylorr committed Feb 15, 2025
1 parent b989dd1 commit 672e771
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,6 @@ <h3 id="_pulling">Pulling</h3>
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.
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>
</div>
<div class="paragraph">
<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>
</div>
</div>
<div class="sect3">
<h3 id="_delete_branches">Deleting Remote Branches</h3>
Expand Down
8 changes: 4 additions & 4 deletions external/book/content/book/en/v2/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
language_code: en
front_page: true
repository_url: https://github.com/progit/progit2
sha: 515e4e11c94d1bf30d21511a85743c159d120dc7
ebook_pdf: https://github.com/progit/progit2/releases/download/2.1.442/progit.pdf
ebook_epub: https://github.com/progit/progit2/releases/download/2.1.442/progit.epub
ebook_mobi: https://github.com/progit/progit2/releases/download/2.1.442/progit.mobi
sha: 3404a4f5e0c1faab3e89ae93d48663413b31dd8d
ebook_pdf: https://github.com/progit/progit2/releases/download/2.1.443/progit.pdf
ebook_epub: https://github.com/progit/progit2/releases/download/2.1.443/progit.epub
ebook_mobi: https://github.com/progit/progit2/releases/download/2.1.443/progit.mobi
page_title: Git - Book
url: "/book/en/v2.html"
aliases:
Expand Down
2 changes: 1 addition & 1 deletion external/book/sync/book-en.sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
515e4e11c94d1bf30d21511a85743c159d120dc7
3404a4f5e0c1faab3e89ae93d48663413b31dd8d

0 comments on commit 672e771

Please sign in to comment.