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

fixing a bunch of broken stuff I think

Browse source
This commit is contained in:
Chris Cochrun 2022-02-25 14:16:41 -06:00
parent 0dbc3ead0e
commit 8bace887a2
1551 changed files with 299 additions and 57481 deletions
Download patch file Download diff file Expand all files Collapse all files

1
var/elfeed/db/data/8a/8a617e6e6572d7ed66c01245463b68df2731dea3
View file

@ -1 +0,0 @@
<table> <tr><td> <a href="https://www.reddit.com/r/unixporn/comments/raax4h/xfce_windows_95/"> <img src="https://preview.redd.it/gkiglp336y381.png?width=640&amp;crop=smart&amp;auto=webp&amp;s=dc58fdf3aa6f98b31762f4039ddb8628ba6d8e1e" alt="[xfce] Windows 95" title="[xfce] Windows 95" /> </a> </td><td> &#32; submitted by &#32; <a href="https://www.reddit.com/user/DarkReaper231"> /u/DarkReaper231 </a> <br/> <span><a href="https://i.redd.it/gkiglp336y381.png">[link]</a></span> &#32; <span><a href="https://www.reddit.com/r/unixporn/comments/raax4h/xfce_windows_95/">[comments]</a></span> </td></tr></table>

74
var/elfeed/db/data/8a/8a6c87df8742c8b767c9d646fc0e80977d9c6b9a
View file

@ -1,74 +0,0 @@
<p>Two weeks without Magit<sup id="fnref:1"><a class="footnote" href="https://www.manueluberti.eu/feed#fn:1" rel="footnote">1</a></sup> have forced me to rethink how I use Git in my
projects. I have already written about <a href="https://www.manueluberti.eu/emacs/2021/11/27/vc/">some
commands</a> I have been using,
but beside basic things, how does Emacs hold up in a more complex situation?</p>
<p>Let’s talk about interactive rebasing. If you are familiar with Magit<sup id="fnref:2"><a class="footnote" href="https://www.manueluberti.eu/feed#fn:2" rel="footnote">2</a></sup>, you
know how simple it gets. This is what I usually do from <code class="language-plaintext highlighter-rouge">magit-status</code>:</p>
<ul>
<li><kbd>l</kbd> for <code class="language-plaintext highlighter-rouge">magit-log</code></li>
<li><kbd>l</kbd> for <code class="language-plaintext highlighter-rouge">current</code></li>
<li><kbd>n</kbd> as many times as needed to move to the commit I want to start
rebasing with</li>
<li><kbd>r</kbd> for <code class="language-plaintext highlighter-rouge">magit-rebase</code></li>
<li><kbd>i</kbd> for <code class="language-plaintext highlighter-rouge">interactive</code></li>
<li><kbd>s</kbd> on the commits I want to squash</li>
<li><kbd>C-c C-c</kbd> to confirm</li>
<li>write the commit message I want</li>
<li><kbd>C-c C-c</kbd> to confirm</li>
<li><kbd>P</kbd> and <kbd>-f</kbd> to push with <code class="language-plaintext highlighter-rouge">--force-with-lease</code> enabled</li>
</ul>
<p>It’s quicker to do it than to write it all down, especially now that it has
become muscle memory. No wonder I was still relying on Magit to interactively
rebase on my first days with VC.</p>
<p>Since I did not find a similar solution in <code class="language-plaintext highlighter-rouge">vc-git</code>, I asked on <code class="language-plaintext highlighter-rouge">emacs-devel</code>
how the core developers approach this workflow: <a href="https://lists.gnu.org/archive/html/emacs-devel/2021-12/msg00238.html">vc-git: interactive
rebasing</a>.
I got different, interesting replies that can be roughly summed up with:</p>
<ul>
<li>bare command line</li>
<li><code class="language-plaintext highlighter-rouge">helm-ls-git</code></li>
<li>custom code</li>
</ul>
<p>Not wanted to be scared away from a non-Magit option, this is what I
have eventually ended up doing:</p>
<ul>
<li>in <code class="language-plaintext highlighter-rouge">shell-mode</code>, I run <code class="language-plaintext highlighter-rouge">git rebase -i &lt;branch&gt;~&lt;commits&gt;</code></li>
<li>in the buffer that opens up I type <code class="language-plaintext highlighter-rouge">squash</code> on the commits I want to squash</li>
<li><kbd>C-x C-s</kbd></li>
<li><kbd>C-x k RET</kbd></li>
<li>in the buffer with the commit message I edit the text as I wish</li>
<li><kbd>C-x C-s</kbd></li>
<li><kbd>C-x k RET</kbd></li>
<li>either I run <code class="language-plaintext highlighter-rouge">git push --force-with-lease</code> from <code class="language-plaintext highlighter-rouge">shell-mode</code>, or <kbd>C-u
P</kbd> from <kbd>C-x p v</kbd> to push with <code class="language-plaintext highlighter-rouge">--force-with-lease</code> added
manually</li>
</ul>
<p>Note that this approach requires that in <code class="language-plaintext highlighter-rouge">~/.config/git/config</code> I have <code class="language-plaintext highlighter-rouge">editor</code>
set to <code class="language-plaintext highlighter-rouge">emacsclient</code> and either I have <code class="language-plaintext highlighter-rouge">server-start</code> somewhere in my <code class="language-plaintext highlighter-rouge">init.el</code>
or I do <kbd>M-x server-start</kbd> before starting the actual rebase.</p>
<p>It looks like that even without Magit I can do everything from Emacs, which
makes for a good alternative in my opinion. Nonetheless, it does not take a PhD
to notice that Magit makes the whole rebasing easier to sort out. Hence, you
will not hear me scream “<em>drop it already and party hard, fellas!</em>”. Sorry.</p>
<h3 id="notes">Notes</h3>
<div class="footnotes">
<ol>
<li id="fn:1">
<p>Not entirely true, but keep reading. <a class="reversefootnote" href="https://www.manueluberti.eu/feed#fnref:1">↩</a></p>
</li>
<li id="fn:2">
<p>Who isn’t in this day and age? <a class="reversefootnote" href="https://www.manueluberti.eu/feed#fnref:2">↩</a></p>
</li>
</ol>
</div>

1
var/elfeed/db/data/8a/8ae4d1f593729ce1e6cc9aa7b0a8feb88c39c3c2
View file

@ -1 +0,0 @@
<table> <tr><td> <a href="https://www.reddit.com/r/unixporn/comments/pphkao/kde_squircle_corners_code_and_info_below/"> <img src="https://preview.redd.it/x9p8lypdewn71.png?width=640&amp;crop=smart&amp;auto=webp&amp;s=8286c0c44db835321ac29fc963746911888f16c8" alt="[KDE] Squircle corners! Code and info below" title="[KDE] Squircle corners! Code and info below" /> </a> </td><td> &#32; submitted by &#32; <a href="https://www.reddit.com/user/KubeRuns"> /u/KubeRuns </a> <br/> <span><a href="https://i.redd.it/x9p8lypdewn71.png">[link]</a></span> &#32; <span><a href="https://www.reddit.com/r/unixporn/comments/pphkao/kde_squircle_corners_code_and_info_below/">[comments]</a></span> </td></tr></table>

1
var/elfeed/db/data/8a/8ae53fe31b1350eb3e1850412939ff01082ef2c3
View file

@ -1 +0,0 @@
<table> <tr><td> <a href="https://www.reddit.com/r/unixporn/comments/qxw6bu/dwm_ricing_my_potato_laptop_hard/"> <img src="https://preview.redd.it/7tnqv5701o081.png?width=640&amp;crop=smart&amp;auto=webp&amp;s=7a3c140c5c373452e557f6bb90983c671228a720" alt="[DWM] Ricing My Potato Laptop Hard" title="[DWM] Ricing My Potato Laptop Hard" /> </a> </td><td> &#32; submitted by &#32; <a href="https://www.reddit.com/user/J0N96R"> /u/J0N96R </a> <br/> <span><a href="https://i.redd.it/7tnqv5701o081.png">[link]</a></span> &#32; <span><a href="https://www.reddit.com/r/unixporn/comments/qxw6bu/dwm_ricing_my_potato_laptop_hard/">[comments]</a></span> </td></tr></table>

1
var/elfeed/db/data/8a/8ae9a2d93bafb50406cc634b6aa776582077fa9f
View file

@ -1 +0,0 @@
<!-- SC_OFF --><div class="md"><ul> <li><strong>Purpose</strong> : To take clean notes or create a short summary of a webpage (blog, documentation etc.) opened in Firefox browser. <ul> <li>Which you can refer again in future (e.g. for revision if you are preparing for exams).</li> <li>The notes would be saved in org format in your computer (or in cloud, maybe) so that the user can customize it and print it as well (or even save in a presentation format).</li> </ul></li> </ul> <p>&#x200B;</p> <ul> <li><strong>Working</strong> : How it works is basically when you are reading a blog post- <ul> <li>An org file for that page would be created.</li> <li>You will highlight the text and a popup button will appear.</li> <li>When you click it, various options appear like <ul> <li>send the selected text as heading or paragraph to org file, maybe send image and various other features that a sane reader requires.</li> </ul></li> <li>Live edit the org file</li> </ul></li> </ul> <p>&#x200B;</p> <ul> <li><strong>Tools</strong> : Things to make this project happen <ul> <li>Firefox extension would be created using JavaScript.</li> <li>Emacs daemon can be used to view the file live.</li> </ul></li> </ul> <p>Now I am a little confused right now and need your suggestions on this, to make this happen or not, as I don&#39;t know the feasibility of this project.</p> <p>Thank you</p> <p><a href="https://www.reddit.com/poll/po2i43">View Poll</a></p> </div><!-- SC_ON --> &#32; submitted by &#32; <a href="https://www.reddit.com/user/eyes_on_camera"> /u/eyes_on_camera </a> <br/> <span><a href="https://www.reddit.com/r/emacs/comments/po2i43/need_opinions_regarding_developing_a_browser/">[link]</a></span> &#32; <span><a href="https://www.reddit.com/r/emacs/comments/po2i43/need_opinions_regarding_developing_a_browser/">[comments]</a></span>