Not sure what happened here.... O.O
This commit is contained in:
parent
34ab43b8f9
commit
0dbc3ead0e
272 changed files with 4767 additions and 12217 deletions
|
|
@ -1,16 +0,0 @@
|
|||
<p class="text">SMcK: I don’t know about you, but these are timely words for me.</p>
|
||||
<p class="text">Advent in Contested Territory: God with us</p>
|
||||
<p class="text">By <a href="https://heatherhartwrites.com/" target="_blank" class="">Heather L. Hart</a></p>
|
||||
<p class="text">Only distance could save us.</p>
|
||||
<p class="text">A tiny, nonliving entity, with the power to kill, invaded bodies and sent us fleeing. Safety was separation, community was danger. Quarantine defined life. It was necessary to detach so we might live. All was beyond our control. Where was God in our death, isolation, division, and fear</p>
|
||||
<p class="text">Christians enter the season of Advent knowing that Jesus, the God-Human, came to rescue the world. A world overrun by inescapable darkness: God’s good creation was the occupied territory of Sin and Death. The people of God longed for God’s promised intervention. Hope for liberation persisted.</p>
|
||||
<p class="text">Jesus is God’s deliverance: the rescuing Savior, the chosen Messiah, the ruling Lord.<a href="#_ftn1" target="_blank" class="">[1]</a> His purpose was to <em>“bring good news to the poor… proclaim release to the captives and sight to the blind, to let the oppressed go free, to proclaim the year of the Lord’s favor.”<a href="#_ftn2" target="_blank" class=""><strong>[2]</strong></a></em> The inescapable darkness became more than merely escapable. The reigning control of Sin and Death was utterly severed by Jesus’ life, death, and resurrection.</p>
|
||||
<p class="text">And yet.</p>
|
||||
<p class="text">And yet, we are overrun by a pandemic. We are overrun by violence, scarcity, bigotry, lies – we are even overrun by our own selves. Our wants, desires, ways of thinking and living, continually spiral away from God.<a href="#_ftn3" target="_blank" class="">[3]</a> The darkness is very real, very near.</p>
|
||||
<p class="text">Advent looks at Jesus’ arrival and sees the approaching liberation from Sin and Death. Advent aches for Christmas because Easter is breathtaking. Advent represents the longing for God’s intervention 2000 years ago, but it also represents our longing for ...</p><p class="more"><a href="https://www.christianitytoday.com/scot-mcknight/2021/december/advent-in-contested-territory-god-with-us.html">Continue reading</a>...</p>
|
||||
<p><br /><a href="https://rss.beaconads.com/click.php?z=1289806&k=c779018782158d93282944b4f7dd4d03&a=191311&c=76830096" target="_blank"><img src="https://rss.beaconads.com/img.php?z=1289806&k=c779018782158d93282944b4f7dd4d03&a=191311&c=76830096" border="0" alt="" /></a></p>
|
||||
|
||||
1
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,76 +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<sup id="fnref:3"><a class="footnote" href="https://www.manueluberti.eu/feed#fn:3" rel="footnote">3</a></sup>. 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 <branch>~<commits></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>
|
||||
<li id="fn:3">
|
||||
<p><a href="https://lists.gnu.org/archive/html/emacs-devel/2021-12/msg00238.html" target="_blank">vc-git: interactive rebasing</a>. <a class="reversefootnote" href="https://www.manueluberti.eu/feed#fnref:3">↩</a></p>
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
Loading…
Add table
Add a link
Reference in a new issue