emacs/var/elfeed/db/data/ef/efc969891b6394b0cd9124427eaa499c269192fd
2022-01-03 12:49:32 -06:00

9 lines
816 B
Plaintext
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

<p>Guangwang Huang (Whatacold) has an instructive video on <a href="https://www.youtube.com/watch?v=7D4cV0aodGw">how to discard commits using Magit</a>. There are three methods:</p>
<ol class="org-ol">
<li>Hard reset</li>
<li>Revert</li>
<li>Soft reset</li>
</ol>
<p>They all have advantages and disadvantages. A hard reset is fast but the discarded commits are deleted. The other two methods are safer but involve more typing. You can get all the details by watching the video.</p>
<p>Using either reset can seem like a scary proposition but Whatacold shows that they are both straightforward and easy to understand. If they still seem too fraught, you can always use revert. It generates more commits but doesnt seem as scary.</p>
<p>The video is 9 minutes, 25 seconds so it should be pretty easy to fit in.</p>