diff options
| author | bt <bt@btxx.org> | 2024-06-08 13:22:19 -0400 |
|---|---|---|
| committer | bt <bt@btxx.org> | 2024-06-08 13:22:19 -0400 |
| commit | dcfb172704f3afb68a30425029ec834be2883274 (patch) | |
| tree | 02ac480745db802d7af03f3213a0c568322170e3 /build/mail/index.html | |
| parent | e146f8a64c793c337999ce316b16ebe5fe6f2dab (diff) | |
More content porting, on-going markdown changes for lowdown support
Diffstat (limited to 'build/mail/index.html')
| -rw-r--r-- | build/mail/index.html | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/build/mail/index.html b/build/mail/index.html index 0b086e8..a000d97 100644 --- a/build/mail/index.html +++ b/build/mail/index.html @@ -1,44 +1,51 @@ <!doctype html> -<html lang="en" id="top"> +<html lang="en"> <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="icon" href="data:,"> <title>Working with `git` Patches in Apple Mail</title> - <link href="https://bt.ht/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" /> - <style>*{box-sizing:border-box;}body{font-family:sans-serif;margin:0 auto;max-width:650px;padding:1rem;}img{max-width:100%;}pre{overflow:auto;}table{text-align:left;width:100%;}</style> + <link href="/atom.xml" type="application/atom+xml" rel="alternate" title="Atom feed for blog posts" /> + <link href="/rss.xml" type="application/rss+xml" rel="alternate" title="RSS feed for blog posts" /> +<style>*{box-sizing:border-box;}body{font-family:sans-serif;line-height:1.33;margin:0 auto;max-width:650px;padding:1rem;}img{max-width:100%;}pre{border:1px solid;overflow:auto;padding:5px;}table{text-align:left;width:100%;}.footnotes{font-size:90%;}</style> </head> <nav> - <a href="#menu">Menu ↓</a> + <a href="#menu">Menu ↓</a> </nav> <main> -<h1>Working with <code>git</code> Patches in Apple Mail</h1> +<h1 id="working-with-patches-in-apple-mail">Working with <code>git</code> Patches in Apple Mail</h1> + <p>2023-05-11</p> -<blockquote><p><strong>Before we begin</strong>: You could likely automate this process in a more streamlined way, but for most use cases this workflow should be fine.</p> + +<blockquote> +<p><strong>Before we begin</strong>: You could likely automate this process in a more streamlined way, but for most use cases this workflow should be fine.</p> </blockquote> + <p>I recently covered how to <a href="/git-patches">work with git email patches in Evolution on Linux</a>, so I thought it would make sense to walk through a similar workflow for those using Apple Mail on MacOS. The idea is essentially the same, with just a little extra work involved.</p> -<h2>Create a "Patches" Mailbox</h2> -<p>The first thing you'll need to do is make a new <code>Patches</code> mailbox folder inside your existing mail account. Once done, your default Mail sidebar should look similar to the following:</p> -<p><figure> - <img src="/public/images/apple-mail-1.png" alt="The Apple Mail sidebar with the Patches folder present"> - <figcaption>The Apple Mail sidebar with the "Patches" folder present</figcaption> -</figure></p> -<h2>Applying Patches</h2> -<p>Now navigate to the email message containing a <code>git</code> patch. Right-click and select <em>Move to</em> > <em>Patches</em>. Now in the sidebar, right-click your <em>Patches</em> folder and select <em>Export Mailbox...</em>. You'll be prompted to save this folder locally. I suggest having a top-level folder named <strong>Patches</strong> to make things consistent.</p> + +<h2 id="create-a-patches-mailbox">Create a “Patches” Mailbox</h2> + +<p>The first thing you’ll need to do is make a new <code>Patches</code> mailbox folder inside your existing mail account. Once done, your default Mail sidebar should look similar to the following:</p> + +<h2 id="applying-patches">Applying Patches</h2> + +<p>Now navigate to the email message containing a <code>git</code> patch. Right-click and select <em>Move to</em> > <em>Patches</em>. Now in the sidebar, right-click your <em>Patches</em> folder and select <em>Export Mailbox…</em>. You’ll be prompted to save this folder locally. I suggest having a top-level folder named <strong>Patches</strong> to make things consistent.</p> + <p>Inside this folder you should see something similar to the following structure:</p> -<p><figure> - <img src="/public/images/apple-mail-2.png" alt="The contents of the saved Patches mailbox folder"> - <figcaption>The contents of the saved Patches mailbox folder</figcaption> -</figure></p> + <p>Once saved, open your terminal, navigate to the project you wish to apply this new patch to:</p> -<pre><code>cd my-path/very-cool-project + +<pre><code>cd my-path/very-cool-project </code></pre> + <p>and then run:</p> -<pre><code>git apply ~/Patches/<saved-patches-mailbox-folder>/mbox + +<pre><code>git apply ~/Patches/<saved-patches-mailbox-folder>/mbox </code></pre> -<p>Congrats! You've successfully applied a git email patch through Apple Mail! Well, kind of. The terminal did most of the <em>real</em> work. Just be sure to periodically <em>purge</em> your local <em>Patches</em> folder to keep things clean!</p> + +<p>Congrats! You’ve successfully applied a git email patch through Apple Mail! Well, kind of. The terminal did most of the <em>real</em> work. Just be sure to periodically <em>purge</em> your local <em>Patches</em> folder to keep things clean!</p> <footer role="contentinfo"> <h2>Menu Navigation</h2> <ul id="menu"> |