Skip to content

Commit

Permalink
book: update sv
Browse files Browse the repository at this point in the history
Updated via the `update-book.yml` GitHub workflow.
  • Loading branch information
ttaylorr committed Sep 29, 2024
1 parent 205db72 commit f0112bb
Show file tree
Hide file tree
Showing 93 changed files with 1,996 additions and 1,959 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ <h4 id="_recommended_workflow">Recommended Workflow</h4>
</div>
</div>
<div class="sect4">
<h4 id="_summary_10">Summary</h4>
<h4 id="_summary_8">Summary</h4>
<div class="paragraph">
<p>These tools are very well-suited for the workflow they’re designed for.
Developers and non-developers alike can be collaborating on a project within minutes, and many of the best practices for this kind of workflow are baked into the tools.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
title: Git - Summary
url: "/book/sv/v2/Bilaga-A:-Git-in-Other-Environments-Summary.html"
---
<h2 id="_summary_11">Summary</h2>
<h2 id="_summary_9">Summary</h2>
<div class="paragraph">
<p>You’ve learned how to harness Git’s power from inside the tools that you use during your everyday work, and also how to access Git repositories from your own programs.</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ <h3 id="_git_diff">git diff</h3>
<p>We first look at the basic uses of <code>git diff</code> in <a href="{{< relurl "book/sv/v2/ch00/_git_diff_staged" >}}">Visa dina förberedda och oförberedda ändringar</a>, where we show how to see what changes are staged and which are not yet staged.</p>
</div>
<div class="paragraph">
<p>We use it to look for possible whitespace issues before committing with the <code>--check</code> option in <a href="{{< relurl "book/sv/v2/ch00/_commit_guidelines" >}}">Commit Guidelines</a>.</p>
<p>We use it to look for possible whitespace issues before committing with the <code>--check</code> option in <a href="{{< relurl "book/sv/v2/ch00/_commit_guidelines" >}}">Riktlinjer för incheckningar</a>.</p>
</div>
<div class="paragraph">
<p>We see how to check the differences between branches more effectively with the <code>git diff A...B</code> syntax in <a href="{{< relurl "book/sv/v2/ch00/_what_is_introduced" >}}">Determining What Is Introduced</a>.</p>
<p>We see how to check the differences between branches more effectively with the <code>git diff A...B</code> syntax in <a href="{{< relurl "book/sv/v2/ch00/_what_is_introduced" >}}">Avgöra vad som ska integreras</a>.</p>
</div>
<div class="paragraph">
<p>We use it to filter out whitespace differences with <code>-b</code> and how to compare different stages of conflicted files with <code>--theirs</code>, <code>--ours</code> and <code>--base</code> in <a href="{{< relurl "book/sv/v2/ch00/_advanced_merging" >}}">Advanced Merging</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ <h3 id="_git_merge">git merge</h3>
Though it is used in various places in the book, there are very few variations of the <code>merge</code> command — generally just <code>git merge &lt;branch&gt;</code> with the name of the single branch you want to merge in.</p>
</div>
<div class="paragraph">
<p>We covered how to do a squashed merge (where Git merges the work but pretends like it’s just a new commit without recording the history of the branch you’re merging in) at the very end of <a href="{{< relurl "book/sv/v2/ch00/_public_project" >}}">Forked Public Project</a>.</p>
<p>We covered how to do a squashed merge (where Git merges the work but pretends like it’s just a new commit without recording the history of the branch you’re merging in) at the very end of <a href="{{< relurl "book/sv/v2/ch00/_public_project" >}}">Öppet, litet projekt</a>.</p>
</div>
<div class="paragraph">
<p>We went over a lot about the merge process and command, including the <code>-Xignore-space-change</code> command and the <code>--abort</code> flag to abort a problem merge in <a href="{{< relurl "book/sv/v2/ch00/_advanced_merging" >}}">Advanced Merging</a>.</p>
Expand Down Expand Up @@ -110,7 +110,7 @@ <h3 id="_git_log">git log</h3>
<p>In <a href="{{< relurl "book/sv/v2/ch00/_create_new_branch" >}}">Skapa en ny gren</a> we use it with the <code>--decorate</code> option to easily visualize where our branch pointers are located and we also use the <code>--graph</code> option to see what divergent histories look like.</p>
</div>
<div class="paragraph">
<p>In <a href="{{< relurl "book/sv/v2/ch00/_private_team" >}}">Private Small Team</a> and <a href="{{< relurl "book/sv/v2/ch00/_commit_ranges" >}}">Commit Ranges</a> we cover the <code>branchA..branchB</code> syntax to use the <code>git log</code> command to see what commits are unique to a branch relative to another branch.
<p>In <a href="{{< relurl "book/sv/v2/ch00/_private_team" >}}">Privat, litet team</a> and <a href="{{< relurl "book/sv/v2/ch00/_commit_ranges" >}}">Commit Ranges</a> we cover the <code>branchA..branchB</code> syntax to use the <code>git log</code> command to see what commits are unique to a branch relative to another branch.
In <a href="{{< relurl "book/sv/v2/ch00/_commit_ranges" >}}">Commit Ranges</a> we go through this fairly extensively.</p>
</div>
<div class="paragraph">
Expand Down Expand Up @@ -143,7 +143,7 @@ <h3 id="_git_tag">git tag</h3>
Generally this is used for things like releases.</p>
</div>
<div class="paragraph">
<p>This command is introduced and covered in detail in <a href="{{< relurl "book/sv/v2/ch00/_git_tagging" >}}">Taggning</a> and we use it in practice in <a href="{{< relurl "book/sv/v2/ch00/_tagging_releases" >}}">Tagging Your Releases</a>.</p>
<p>This command is introduced and covered in detail in <a href="{{< relurl "book/sv/v2/ch00/_git_tagging" >}}">Taggning</a> and we use it in practice in <a href="{{< relurl "book/sv/v2/ch00/_tagging_releases" >}}">Versionsmarkeringar</a>.</p>
</div>
<div class="paragraph">
<p>We also cover how to create a GPG signed tag with the <code>-s</code> flag and verify one with the <code>-v</code> flag in <a href="{{< relurl "book/sv/v2/ch00/_signing" >}}">Signing Your Work</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h3 id="_git_apply">git apply</h3>
It is similar to what the <code>patch</code> command might do with a few small differences.</p>
</div>
<div class="paragraph">
<p>We demonstrate using it and the circumstances in which you might do so in <a href="{{< relurl "book/sv/v2/ch00/_patches_from_email" >}}">Applying Patches from Email</a>.</p>
<p>We demonstrate using it and the circumstances in which you might do so in <a href="{{< relurl "book/sv/v2/ch00/_patches_from_email" >}}">Arbeta via mejl</a>.</p>
</div>
</div>
<div class="sect3">
Expand All @@ -40,7 +40,7 @@ <h3 id="_git_am_2">git am</h3>
This is useful for receiving patches over email and applying them to your project easily.</p>
</div>
<div class="paragraph">
<p>We covered usage and workflow around <code>git am</code> in <a href="{{< relurl "book/sv/v2/ch00/_git_am" >}}">Applying a Patch with <code>am</code></a> including using the <code>--resolved</code>, <code>-i</code> and <code>-3</code> options.</p>
<p>We covered usage and workflow around <code>git am</code> in <a href="{{< relurl "book/sv/v2/ch00/_git_am" >}}">Applicera en mejlad patch med <code>am</code></a> including using the <code>--resolved</code>, <code>-i</code> and <code>-3</code> options.</p>
</div>
<div class="paragraph">
<p>There are also a number of hooks you can use to help with the workflow around <code>git am</code> and they are all covered in <a href="{{< relurl "book/sv/v2/ch00/_email_hooks" >}}">Email Workflow Hooks</a>.</p>
Expand All @@ -55,7 +55,7 @@ <h3 id="_git_format_patch">git format-patch</h3>
<p>The <code>git format-patch</code> command is used to generate a series of patches in mbox format that you can use to send to a mailing list properly formatted.</p>
</div>
<div class="paragraph">
<p>We go through an example of contributing to a project using the <code>git format-patch</code> tool in <a href="{{< relurl "book/sv/v2/ch00/_project_over_email" >}}">Public Project over Email</a>.</p>
<p>We go through an example of contributing to a project using the <code>git format-patch</code> tool in <a href="{{< relurl "book/sv/v2/ch00/_project_over_email" >}}">Öppet, större projekt via mejl</a>.</p>
</div>
</div>
<div class="sect3">
Expand All @@ -64,7 +64,7 @@ <h3 id="_git_imap_send">git imap-send</h3>
<p>The <code>git imap-send</code> command uploads a mailbox generated with <code>git format-patch</code> into an IMAP drafts folder.</p>
</div>
<div class="paragraph">
<p>We go through an example of contributing to a project by sending patches with the <code>git imap-send</code> tool in <a href="{{< relurl "book/sv/v2/ch00/_project_over_email" >}}">Public Project over Email</a>.</p>
<p>We go through an example of contributing to a project by sending patches with the <code>git imap-send</code> tool in <a href="{{< relurl "book/sv/v2/ch00/_project_over_email" >}}">Öppet, större projekt via mejl</a>.</p>
</div>
</div>
<div class="sect3">
Expand All @@ -73,7 +73,7 @@ <h3 id="_git_send_email">git send-email</h3>
<p>The <code>git send-email</code> command is used to send patches that are generated with <code>git format-patch</code> over email.</p>
</div>
<div class="paragraph">
<p>We go through an example of contributing to a project by sending patches with the <code>git send-email</code> tool in <a href="{{< relurl "book/sv/v2/ch00/_project_over_email" >}}">Public Project over Email</a>.</p>
<p>We go through an example of contributing to a project by sending patches with the <code>git send-email</code> tool in <a href="{{< relurl "book/sv/v2/ch00/_project_over_email" >}}">Öppet, större projekt via mejl</a>.</p>
</div>
</div>
<div class="sect3">
Expand All @@ -83,7 +83,7 @@ <h3 id="_git_request_pull">git request-pull</h3>
If you have a branch on a public server and want to let someone know how to integrate those changes without sending the patches over email, you can run this command and send the output to the person you want to pull the changes in.</p>
</div>
<div class="paragraph">
<p>We demonstrate how to use <code>git request-pull</code> to generate a pull message in <a href="{{< relurl "book/sv/v2/ch00/_public_project" >}}">Forked Public Project</a>.</p>
<p>We demonstrate how to use <code>git request-pull</code> to generate a pull message in <a href="{{< relurl "book/sv/v2/ch00/_public_project" >}}">Öppet, litet projekt</a>.</p>
</div>
</div>
<div id="nav"><a href="{{< previous-section >}}">prev</a> | <a href="{{< next-section >}}">next</a></div>
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ <h3 id="_git_shortlog">git shortlog</h3>
It will take many of the same options that the <code>git log</code> command will but instead of listing out all of the commits it will present a summary of the commits grouped by author.</p>
</div>
<div class="paragraph">
<p>We showed how to use it to create a nice changelog in <a href="{{< relurl "book/sv/v2/ch00/_the_shortlog" >}}">The Shortlog</a>.</p>
<p>We showed how to use it to create a nice changelog in <a href="{{< relurl "book/sv/v2/ch00/_the_shortlog" >}}">Shortlog</a>.</p>
</div>
</div>
<div class="sect3">
Expand All @@ -52,7 +52,7 @@ <h3 id="_git_describe">git describe</h3>
It’s a way to get a description of a commit that is as unambiguous as a commit SHA-1 but more understandable.</p>
</div>
<div class="paragraph">
<p>We use <code>git describe</code> in <a href="{{< relurl "book/sv/v2/ch00/_build_number" >}}">Generating a Build Number</a> and <a href="{{< relurl "book/sv/v2/ch00/_preparing_release" >}}">Preparing a Release</a> to get a string to name our release file after.</p>
<p>We use <code>git describe</code> in <a href="{{< relurl "book/sv/v2/ch00/_build_number" >}}">Generera versionsnummer</a> and <a href="{{< relurl "book/sv/v2/ch00/_preparing_release" >}}">Förbereda ett släpp</a> to get a string to name our release file after.</p>
</div>
</div>
<div id="nav"><a href="{{< previous-section >}}">prev</a> | <a href="{{< next-section >}}">next</a></div>
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h3 id="_git_cherry_pick">git cherry-pick</h3>
This can be useful to only take one or two commits from a branch individually rather than merging in the branch which takes all the changes.</p>
</div>
<div class="paragraph">
<p>Cherry picking is described and demonstrated in <a href="{{< relurl "book/sv/v2/ch00/_rebase_cherry_pick" >}}">Rebasing and Cherry-Picking Workflows</a>.</p>
<p>Cherry picking is described and demonstrated in <a href="{{< relurl "book/sv/v2/ch00/_rebase_cherry_pick" >}}">Arbetsflöden med ombasering och plocka russin ur kakan</a>.</p>
</div>
</div>
<div class="sect3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ <h3 id="_git_fetch">git fetch</h3>
<p>We first look at this command in <a href="{{< relurl "book/sv/v2/ch00/_fetching_and_pulling" >}}">Hämta och uppdatera från dina fjärrförvar</a> and we continue to see examples of its use in <a href="{{< relurl "book/sv/v2/ch00/_remote_branches" >}}">Fjärrgrenar</a>.</p>
</div>
<div class="paragraph">
<p>We also use it in several of the examples in <a href="{{< relurl "book/sv/v2/ch00/_contributing_project" >}}">Contributing to a Project</a>.</p>
<p>We also use it in several of the examples in <a href="{{< relurl "book/sv/v2/ch00/_contributing_project" >}}">Medverka i ett projekt</a>.</p>
</div>
<div class="paragraph">
<p>We use it to fetch a single specific reference that is outside of the default space in <a href="{{< relurl "book/sv/v2/ch00/_pr_refs" >}}">Pull Request Refs</a> and we see how to fetch from a bundle in <a href="{{< relurl "book/sv/v2/ch00/_bundling" >}}">Bundling</a>.</p>
Expand All @@ -53,7 +53,7 @@ <h3 id="_git_pull">git pull</h3>
<p>We also see how to use it to help with rebasing difficulties in <a href="{{< relurl "book/sv/v2/ch00/_rebase_rebase" >}}">Flytta en gren när du flyttar en gren</a>.</p>
</div>
<div class="paragraph">
<p>We show how to use it with a URL to pull in changes in a one-off fashion in <a href="{{< relurl "book/sv/v2/ch00/_checking_out_remotes" >}}">Checking Out Remote Branches</a>.</p>
<p>We show how to use it with a URL to pull in changes in a one-off fashion in <a href="{{< relurl "book/sv/v2/ch00/_checking_out_remotes" >}}">Checka ut fjärrgrenar</a>.</p>
</div>
<div class="paragraph">
<p>Finally, we very quickly mention that you can use the <code>--verify-signatures</code> option to it in order to verify that commits you are pulling have been GPG signed in <a href="{{< relurl "book/sv/v2/ch00/_signing_commits" >}}">Signing Commits</a>.</p>
Expand All @@ -72,7 +72,7 @@ <h3 id="_git_push">git push</h3>
In <a href="{{< relurl "book/sv/v2/ch00/_delete_branches" >}}">Ta bort Fjärrgrenar</a> we use the <code>--delete</code> flag to delete a branch on the server with <code>git push</code>.</p>
</div>
<div class="paragraph">
<p>Throughout <a href="{{< relurl "book/sv/v2/ch00/_contributing_project" >}}">Contributing to a Project</a> we see several examples of using <code>git push</code> to share work on branches through multiple remotes.</p>
<p>Throughout <a href="{{< relurl "book/sv/v2/ch00/_contributing_project" >}}">Medverka i ett projekt</a> we see several examples of using <code>git push</code> to share work on branches through multiple remotes.</p>
</div>
<div class="paragraph">
<p>We see how to use it to share tags that you have made with the <code>--tags</code> option in <a href="{{< relurl "book/sv/v2/ch00/_sharing_tags" >}}">Dela taggar</a>.</p>
Expand Down Expand Up @@ -108,7 +108,7 @@ <h3 id="_git_archive">git archive</h3>
<p>The <code>git archive</code> command is used to create an archive file of a specific snapshot of the project.</p>
</div>
<div class="paragraph">
<p>We use <code>git archive</code> to create a tarball of a project for sharing in <a href="{{< relurl "book/sv/v2/ch00/_preparing_release" >}}">Preparing a Release</a>.</p>
<p>We use <code>git archive</code> to create a tarball of a project for sharing in <a href="{{< relurl "book/sv/v2/ch00/_preparing_release" >}}">Förbereda ett släpp</a>.</p>
</div>
</div>
<div class="sect3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
next: book/sv/v2/Git-and-Other-Systems-Git-as-a-Client
title: Git - Summary
---
<h2 id="_summary_6">Summary</h2>
<h2 id="_summary_4">Summary</h2>
<div class="paragraph">
<p>We’ve covered most of the major ways that you can customize your Git client and server to best fit your workflow and projects.
You’ve learned about all sorts of configuration settings, file-based attributes, and event hooks, and you’ve built an example policy-enforcing server.
Expand Down
Loading

0 comments on commit f0112bb

Please sign in to comment.