diff options
Diffstat (limited to 'build/git-patches/index.html')
| -rw-r--r-- | build/git-patches/index.html | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/build/git-patches/index.html b/build/git-patches/index.html index 3409f1e..89295cc 100644 --- a/build/git-patches/index.html +++ b/build/git-patches/index.html @@ -1,33 +1,47 @@ <!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>Applying Email-Based Git Patches in Evolution on Linux</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>Applying Email-Based Git Patches in Evolution on Linux</h1> +<h1 id="applying-email-based-git-patches-in-evolution-on-linux">Applying Email-Based Git Patches in Evolution on Linux</h1> + <p>2023-04-25</p> + <p>Users who work with git patches through email most likely use a terminal-based program such as <code>aerc</code> or <code>mutt</code>. CLI email clients tend to have built-in support for easily applying patches directly to their local repos. But what about people who prefer to use graphical email apps?</p> + <p>Lucky for us, it is actually fairly simple to replicate a similar workflow to that of a CLI client. In this example I will be focusing on the Evolution email client, but the core principles should work in most other GUIs.</p> -<h2>The Basics</h2> -<blockquote><p><strong>Note:</strong> The following assumes you already have <code>git</code> installed and setup on your existing system.</p> + +<h2 id="the-basics">The Basics</h2> + +<blockquote> +<p><strong>Note:</strong> The following assumes you already have <code>git</code> installed and setup on your existing system.</p> </blockquote> -<p>I find it best to first create a top-level folder on your system named <code>patches</code>. We will use this folder as a temporary location for reviewing any <code>git</code> patches submitted via email. I normally place this under <code>/home/<username>/patches</code>.</p> -<p>Next, locate the email patch in Evolution and right-click on it. Select "Save as mbox..." and place this file inside your newly created <code>patches</code> folder.</p> + +<p>I find it best to first create a top-level folder on your system named <code>patches</code>. We will use this folder as a temporary location for reviewing any <code>git</code> patches submitted via email. I normally place this under <code>/home/<username>/patches</code>.</p> + +<p>Next, locate the email patch in Evolution and right-click on it. Select “Save as mbox…” and place this file inside your newly created <code>patches</code> folder.</p> + <p>Now simply open your terminal, navigate to your project and run:</p> -<pre><code>git am <path-to-patches-folder>/<patch-filename>.mbox + +<pre><code>git am <path-to-patches-folder>/<patch-filename>.mbox </code></pre> -<p>This should apply the patch directly to your project without issue. You are now free to test these changes locally. If everything looks good, you're able to instantly push these changes remotely.</p> + +<p>This should apply the patch directly to your project without issue. You are now free to test these changes locally. If everything looks good, you’re able to instantly push these changes remotely.</p> + <p>Done and done.</p> + <p>Feel free to purge your <code>patches</code> folder regularly or keep them around for future reference if you prefer!</p> <footer role="contentinfo"> <h2>Menu Navigation</h2> |