frontpage.
newsnewestaskshowjobs

Open Source @Github

fp.

Open in hackernews

Working with Git Patches in Apple Mail (2023)

https://btxx.org/posts/mail/
50•todsacerdoti•1y ago

Comments

johnrob•1y ago
Once I discovered how git apply can take diff files (or patch files) as input, I stopped using git stash in favor of plain old files. Easier to list and browse the contents of prior edits, also you can grep the files as method of search. I’ve even found myself copying and editing the diffs before applying.
barbazoo•1y ago
Oh that’s clever, I’ll try that out. Looks like you could just do a git diff > file.patch.

Neat.

johnrob•1y ago
You’ll also want to familiarize with “git apply -3 <file name>”, for when a diff can’t be applied cleanly. It will try “harder” to merge (three way method) and if it still fails it invokes the conflict merge “UX”:

<<<<<<<<<

=========

>>>>>>>>>

smcameron•1y ago
There's also Neil Brown's "wiggle" program for applying patches that don't apply.

https://github.com/neilbrown/wiggle

although on debian based systems I think you can just "apt install wiggle"

johnisgood•1y ago
What does "applying patches that don't apply" mean exactly?

I know about wiggle, but I have not used it, to be honest.

smcameron•1y ago
It means that if you do "patch -p1 --dry-run < some.patch", and it complains that it doesn't apply, wiggle can sometimes apply it anyway, and also, if you do "patch -p1 < some.patch", and it partially applies but with rejected hunks, wiggle can try to apply the rejected hunks.
johannes1234321•1y ago
git diff an pipe works, but committing and then `git format-patch` can export multiple patches and then includes metadata (commit message, date, author, etc.) which can make reasoning about such files a lot easier. In a plain diff you only got filename as metadata.
RaoulP•1y ago
That’s a great idea, and very timely for me.
d3ckard•1y ago
Thank you, will try. Useful bit of knowledge.
OskarS•1y ago
That is a very neat trick, I agree.

I personally approaches stashes as undoable "clean up", and I never have anything really important that I want to save there. If I do have something like that, I just commit with a "WIP <some-descriptive-string>" message and don't push it, then a "git reset --mixed HEAD^" when I want to get back to it.

However, just FYI: you can "grep" your stashes really easily if you want to. just "git stash list -p" gives you the diffs for all the stashes, by default in "less" where you can search them, but you can pipe it to grep if you want. I somewhat frequently do that with "git log", if I want to know "when did this variable change?" or whatever, just "git log -p" to get the log with diffs in less, then search for whatever it was with a slash.

teeray•1y ago
Maybe slightly O/T, but has anyone found a decent way to `git send-email` with email hosts that demand OAuth? (looking at you Outlook and Gmail)
ravetcofx•1y ago
Generating app passwords for those would work.
pm215•1y ago
Yeah, I use an app specific password with Gmail, like the setup suggested by https://git-send-email.io/#step-2

Exchange historically had a tendency to mangle emails sent through it (whitespace changes, line wrap, etc), which is obviously bad news for patchmails. I dunno if it's any better these days.

computerfriend•1y ago
For Gmail, you can use https://github.com/google/gmail-oauth2-tools/tree/master/go/....
mathstuf•1y ago
I use msmtp with a tool from the oauth2-tools repo to do the rotation token dance. Need to register your own app with Google though.
dmarinus•1y ago
palata•1y ago
I like doing it with aerc [1]. It's even possible to use aerc in parallel to another email client. Just open aerc for git-related emails, and that's it!

[1]: https://drewdevault.com/2022/07/25/Code-review-with-aerc.htm...

kazinator•1y ago
View the e-mail raw in your browser, select all, copy, paste into git apply.

Then you don't need that message to be in a file-based inbox that is accessible from your git repo.

And in that case you are still likely going to have to copy and paste something to get the correct path.

sircastor•1y ago
It looks like Apple Mail has plugin support, I wonder if you could author a plugin that’d provide a button to apply the diff.
smcameron•1y ago
If you work with git and patches a lot, stgit is worth a look.

https://stacked-git.github.io

johnisgood•1y ago
At that point, why not just use Pijul or even Darcs?
smcameron•1y ago
Because the codebase you're working on is on github?

And I think you may underestimate the power of stgit. You can manage thousands of patches concurrently, no problem. If you're a maintainer getting patches from loads of people all the time, this is valuable. stgit has it's origins in quilt, which in turn has its origins in Andrew Morton's patch scripts[1], and I know for a fact that Andrew Morton actually managed thousands of patches at a time for years in his work on the linux kernel, because I once sent him a patch against those scripts, and he complained it was slow because I used an O(n^2) algorithm, which worked fine with a handful of patches, and I asked him how many patches he had, and he told me a number that was multiple thousands, so this isn't a hypothetical example.

[1] https://lwn.net/Articles/13518/

davmail supports smtp through outlook(365)
ndegruchy•1y ago
Yeah, I used DAVMail with Emacs+MSMTP+MPOP+notmuch for ages. Works really well, the only occasional thing I had to do was reauthenticate the token, which pops up in a browser window.
ozarker•1y ago
I think you could set up postfix to smtp forward to those services. So it could handle the oauth2 and you wouldn’t need to configure your client
p_wood•1y ago
I use an app password but https://github.com/AdityaGarg8/git-credential-email apparently supports OAuth with Gmail, yahoo and outlook
arthurmorgan123•1y ago
I tried this with Gmail and Outlook. Works flawlessly and also doesn't need to authenticate frequently. The Authen::SASL thing was a catch though.

git-send-email also has some quirks for Outlook which have been recently merged.

Dependent if expressions without dependent types

https://haskellforall.com/2026/09/dependent-if-expressions
1•g0xA52A2A•1m ago•0 comments

Why a Data Catalog Breach Is Different

https://www.cybersecurity-insiders.com/why-a-data-catalog-breach-is-different-and-why-you-cant-ju...
1•mooreds•2m ago•0 comments

How AI Is Ruining the Electric Grid

https://www.youtube.com/watch?v=3__HO-akNC8
2•alphabetatango•3m ago•0 comments

China's solar expansion policy reduces bird diversity

https://www.science.org/doi/10.1126/science.aee0747
2•alphabetatango•6m ago•0 comments

Stripe is giving off early Google vibes

https://fortune.com/2026/09/02/stripe-is-giving-off-early-google-vibesfor-good-and-for-bad/
2•benzguo•8m ago•1 comments

Teachers, students file new lawsuits against OpenAI over Tumbler Ridge shooting

https://www.cbc.ca/news/canada/british-columbia/tumbler-ridge-shooting-open-ai-lawsuits-9.7328382
2•speckx•8m ago•0 comments

Black Hole of Los Alamos Seller of surplus nuclear research materials

https://www.atlasobscura.com/places/black-hole-of-los-alamos
1•Bluestein•9m ago•0 comments

Rubber ducking your blog post with an LLM

https://writethatblog.substack.com/p/rubber-ducking-your-blog-post-with-llms
1•cyndunlop•12m ago•0 comments

Gpuix-Svelte: Svelte custom renderer for GPUI

https://github.com/khromov/gpuix-svelte
2•zapt02•13m ago•0 comments

The American Worker vs. the Most Qualified

https://www.marginallycompelling.com/p/the-american-worker-vs-the-most-qualified
3•skmurphy•13m ago•2 comments

Using Cloudflare Workers and reCAPTCHA v3 for a Static Site Contact Form

https://nooshu.com/blog/2026/03/09/using-cloudflare-workers-and-recaptcha-v3-for-a-static-site-co...
1•speckx•13m ago•0 comments

Welcome to the 32nd Annual IFComp

https://blog.ifcomp.org/post/826592417493008384/welcome-to-the-32nd-annual-ifcomp
2•crtasm•14m ago•0 comments

The Qantas A380 engine disintegration in 2010

https://admiralcloudberg.medium.com/a-matter-of-millimeters-the-story-of-qantas-flight-32-bdaa62d...
1•gumby•14m ago•0 comments

Show HN: Arbitale – emergent choose your own adventure game

https://www.arbitale.com
1•ezclap•14m ago•0 comments

Freelancers are getting buried with 'soulless' AI slop cleanup

https://www.theguardian.com/technology/2026/sep/02/ai-jobs-freelance-cleanup
2•CrypticShift•15m ago•0 comments

Eyeprolog: Turning Prolog programs into answers and inspectable proofs

https://github.com/eyereasoner/eyeprolog
1•simonpure•15m ago•0 comments

An Ancient Poop Explosion Could Have Helped Complex Life Evolve

https://www.sciencealert.com/an-ancient-poop-explosion-could-have-helped-complex-life-evolve
2•EveryonePoops•15m ago•0 comments

Arcva

https://arcva.app
1•Tameer_Shawah•16m ago•0 comments

Adventure and Amygdalectomy Advocacy

https://www.astralcodexten.com/p/absurd-adventure-and-amygdalectomy
3•paulpauper•16m ago•0 comments

Missouri Voters Appear to Recall City Councilman over Data Center Support

https://www.nytimes.com/2026/09/01/technology/data-center-recall-vote-independence.html
7•cocacola1•17m ago•1 comments

We are causing sycophancy and evasion

https://www.unite.ai/ai-safety-psychology-trauma-framework-model-behavior/
4•lokatewry•21m ago•0 comments

German industry pushes to restore 40-hour working week without extra pay

https://www.ft.com/content/76a9c61b-021f-482d-8978-6480e9ba23e8
4•alephnerd•21m ago•1 comments

Offpunk Manifesto

https://blog.ayom.media/ideiasdechirico/offpunk-manifesto
2•yu3zhou4•24m ago•0 comments

Oh-My-Openagent

https://github.com/code-yeongyu/oh-my-openagent/tree/dev
3•mooreds•24m ago•0 comments

Embedded Rust RTOS vs. C RTOS

https://tweedegolf.nl/en/blog/65/async-rust-vs-rtos-showdown/
2•kooi•24m ago•0 comments

Firefox's AI Switch Is Off. Telemetry Isn't

https://marius.blog/firefox-155-ai-kill-switch-retest/
7•speckx•26m ago•0 comments

Hong Kong activist Joshua Wong pleads guilty in second national security case

https://www.nbcnews.com/world/asia/hong-kong-activist-joshua-wong-pleads-guilty-second-national-s...
4•mikhael•27m ago•0 comments

I Am not Going To Buy A Computer (2000) [pdf]

https://classes.matthewjbrown.net/teaching-files/philtech/berry-computer.pdf
2•Tomte•27m ago•0 comments

Shein's Unhappy IPO

https://www.ft.com/content/66df7f0e-ce6a-4619-8044-fa23423db3e7
4•JumpCrisscross•28m ago•2 comments

CFTC moots rules to stop prediction markets from giving affiliates advantages [pdf]

https://www.govinfo.gov/content/pkg/FR-2026-08-06/pdf/2026-15948.pdf
3•JumpCrisscross•28m ago•0 comments