<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
	<id>https://wiki.deathbybandaid.net/index.php?action=history&amp;feed=atom&amp;title=Git</id>
	<title>Git - Revision history</title>
	<link rel="self" type="application/atom+xml" href="https://wiki.deathbybandaid.net/index.php?action=history&amp;feed=atom&amp;title=Git"/>
	<link rel="alternate" type="text/html" href="https://wiki.deathbybandaid.net/index.php?title=Git&amp;action=history"/>
	<updated>2026-07-05T20:27:41Z</updated>
	<subtitle>Revision history for this page on the wiki</subtitle>
	<generator>MediaWiki 1.41.1</generator>
	<entry>
		<id>https://wiki.deathbybandaid.net/index.php?title=Git&amp;diff=6&amp;oldid=prev</id>
		<title>Deathbybandaid: Created page with &quot;This is a cheatsheet for git stuff ==Pull a specific directory==  &lt;nowiki&gt;git -C /home/sopel/sopel/ pull&lt;/nowiki&gt; ==Syncing your fork with upstream== Step 1) configure remote repository as upstream  &lt;nowiki&gt;git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git&lt;/nowiki&gt; Step 2) checkout your branch to sync, usually master  &lt;nowiki&gt;git checkout master&lt;/nowiki&gt; Step 4) fetch upstream  &lt;nowiki&gt;git fetch upstream&lt;/nowiki&gt; Step 4) merge upstream  &lt;n...&quot;</title>
		<link rel="alternate" type="text/html" href="https://wiki.deathbybandaid.net/index.php?title=Git&amp;diff=6&amp;oldid=prev"/>
		<updated>2021-12-08T20:11:19Z</updated>

		<summary type="html">&lt;p&gt;Created page with &amp;quot;This is a cheatsheet for git stuff ==Pull a specific directory==  &amp;lt;nowiki&amp;gt;git -C /home/sopel/sopel/ pull&amp;lt;/nowiki&amp;gt; ==Syncing your fork with upstream== Step 1) configure remote repository as upstream  &amp;lt;nowiki&amp;gt;git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git&amp;lt;/nowiki&amp;gt; Step 2) checkout your branch to sync, usually master  &amp;lt;nowiki&amp;gt;git checkout master&amp;lt;/nowiki&amp;gt; Step 4) fetch upstream  &amp;lt;nowiki&amp;gt;git fetch upstream&amp;lt;/nowiki&amp;gt; Step 4) merge upstream  &amp;lt;n...&amp;quot;&lt;/p&gt;
&lt;p&gt;&lt;b&gt;New page&lt;/b&gt;&lt;/p&gt;&lt;div&gt;This is a cheatsheet for git stuff&lt;br /&gt;
==Pull a specific directory==&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git -C /home/sopel/sopel/ pull&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
==Syncing your fork with upstream==&lt;br /&gt;
Step 1) configure remote repository as upstream&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
Step 2) checkout your branch to sync, usually master&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git checkout master&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
Step 4) fetch upstream&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git fetch upstream&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
Step 4) merge upstream&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git merge upstream/master&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
==rebase==&lt;br /&gt;
Step 1) checkout your branch to sync&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git checkout branchname_to_update&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
Step 2) rebase branch to master&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git rebase -i master&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
Step 3) squash commits into one&lt;br /&gt;
&lt;br /&gt;
Step 3) select commit messages to keep&lt;br /&gt;
&lt;br /&gt;
Step 4) push changes&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git push -f origin branchname_to_update&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
==ammend commit names==&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git commit --amend&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
==force local repo to align with remote==&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git fetch origin&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git reset --hard origin/master&amp;lt;/nowiki&amp;gt;&lt;br /&gt;
==delete branch locally==&lt;br /&gt;
You must be on a different branch&lt;br /&gt;
 &amp;lt;nowiki&amp;gt;git branch -D branchname_to_delete&amp;lt;/nowiki&amp;gt;&lt;/div&gt;</summary>
		<author><name>Deathbybandaid</name></author>
	</entry>
</feed>