chris/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

trying to fix

Browse source
This commit is contained in:
Chris Cochrun 2022-01-03 12:41:35 -06:00
parent fa407dfeb6
commit e013d7569e
22945 changed files with 447936 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
var/elfeed/db/data/ef/efc969891b6394b0cd9124427eaa499c269192fd Normal file
View file

@ -0,0 +1,9 @@
<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 doesn’t seem as scary.</p>
<p>The video is 9 minutes, 25 seconds so it should be pretty easy to fit in.</p>