https://wiki.linux.se/index.php?action=history&feed=atom&title=git-merge%281%29 2026-05-27T13:12:44Z Versionshistorik för denna sida på wikin MediaWiki 1.38.4 https://wiki.linux.se/index.php?title=git-merge(1)&diff=9594&oldid=prev 2026-05-27T09:07:38Z

<p><span dir="auto"><span class="autocomment">Sidor som hänvisar till denna sida</span></span></p> <table style="background-color: #fff; color: #202122;" data-mw="interface"> <col class="diff-marker" /> <col class="diff-content" /> <col class="diff-marker" /> <col class="diff-content" /> <tr class="diff-title" lang="sv"> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">← Äldre version</td> <td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">Versionen från 27 maj 2026 kl. 09.07</td> </tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l695">Rad 695:</td> <td colspan="2" class="diff-lineno">Rad 695:</td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br/></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br/></td></tr> <tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>[[git(1)]], [[git-branch(1)]], [[git-cherry-pick(1)]], [[git-commit(1)]], [[git-config(1)]], [[git-diff(1)]], [[git-fmt-merge-msg(1)]], [[git-merge(1)]], [[git-merge-base(1)]], [[git-merge-tree(1)]], [[git-pull(1)]], [[git-revert(1)]], [[stg-repair(1)]], [[githooks(5)]], [[giteveryday(7)]], [[gitglossary(7)]], [[gitworkflows(7)]].</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>[[git(1)]], [[git-branch(1)]], [[git-cherry-pick(1)]], [[git-commit(1)]], [[git-config(1)]], [[git-diff(1)]], [[git-fmt-merge-msg(1)]], [[git-merge(1)]], [[git-merge-base(1)]], [[git-merge-tree(1)]], [[git-pull(1)]], [[git-revert(1)]], [[stg-repair(1)]], [[githooks(5)]], [[giteveryday(7)]], [[gitglossary(7)]], [[gitworkflows(7)]].</div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">= Sidslut =</ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">Orginalhemsidan på Engelska https://man7.org/linux/man-pages/man1/git-merge.1.html</ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">Det här är en maskinöversättning av Linux man sidor till svenska. Om du hittar fel är vi tacksamma om du rapporterar dem via formuläret som finns på </ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">https://www.linux.se/kontaka-linux-se/</ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">&lt;BR>&lt;BR>Tack till [https://datorhjalp.se/web/datorhjalp-hemma// Datorhjälp hemma] som har  sponsrat [https://www.linux.se Linux.se] med webbhotell.</ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;"></ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">[[Kategori:Linuxmanual grupp 1]]</ins></div></td></tr> <tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">[[Kategori:Linuxmanual]]</ins></div></td></tr> </table>

Admin https://wiki.linux.se/index.php?title=git-merge(1)&diff=9593&oldid=prev 2026-05-27T09:06:55Z

<p>Skapade sidan med &#039;= git-merge(1) = == Namn == git-merge - sammanfoga två eller flera utvecklingshistoriker == Synopsis == &lt;pre&gt; git merge [-n] [--stat] [--compact-summary] [--no-commit] [--squash] [--[no-]edit] [--no-verify] [-s &lt;strategi&gt;] [-X &lt;strategialternativ&gt;] [-S[&lt;nyckel-id&gt;]] [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate] [-m &lt;meddelande&gt;] [-F &lt;fil&gt;] [--into-name &lt;gren&gt;] [&lt;commit&gt;...] git merge (--continue | --abort | --...&#039;</p> <a href="https://wiki.linux.se/index.php?title=git-merge(1)&amp;diff=9593">Visa ändringar</a>

Admin