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.

Ralph Merkle: Energy Limits to the Computational Power of the Human Brain (1989)

https://ralphmerkle.com/brainLimits.html
1•Mr_Minderbinder•1m ago•0 comments

European firms afraid of US tech kill switch but haven't made an escape plan

https://www.theregister.com/off-prem/2026/08/06/european-firms-afraid-of-us-tech-kill-switch-but-...
1•baud147258•2m ago•0 comments

Claude Fable 5 AI finds a formula that topples an 87-year-old math conjecture

https://www.sciencedaily.com/releases/2026/08/260804034634.htm
1•thaherster•3m ago•0 comments

Reconsidering My Relationship with the Fediverse

https://mijndertstuij.nl/posts/reconsidering-my-relationship-with-the-fediverse/
1•wseqyrku•3m ago•0 comments

Persistent Memory and Derived Context: A Two-Layer Pattern for Agents

https://blogs.oracle.com/developers/persistent-memory-and-derived-context-a-two-layer-pattern-for...
1•ankitg12•5m ago•0 comments

MCP in the Enterprise

https://medium.com/@parthmghayal/mcp-in-the-enterprise-0d40b64a866b
1•parthmghayal•6m ago•0 comments

"Build In Public" but how do you do it without making it a full-time job?

1•Amrani•7m ago•0 comments

You 're right to push back

https://anedelkos.eu/posts/agentic-disobedience/
2•andned•12m ago•0 comments

Cookies Became the Web's Memory

https://www.makonea.com/en-US/blog/how-cookies-became-the-web-s-memory
2•jdw64•12m ago•0 comments

Calculus-free PID almost in a spreadsheet

https://hackaday.com/2026/08/06/calculus-free-pid-almost-in-a-spreadsheet/
1•znpy•14m ago•0 comments

Show HN: Aident Loadout – connect Codex to real apps with 25000 actions

https://github.com/Aident-AI/aident-skill
2•luciana1u•16m ago•1 comments

MacGregor the Bridge Builder

https://www.astralcodexten.com/p/macgregor-the-bridge-builder
1•Michelangelo11•18m ago•0 comments

Musk's new chip factory will cover 100M square feet

https://twitter.com/elonmusk/status/2085377974396752305
1•BlueBerry2001•19m ago•0 comments

AetherGrid – Distributed AI compute orchestration without K8s

https://github.com/wycliffRotich-dev/aethergrid
1•WycliffeRotich•21m ago•0 comments

Big Numbers

https://seneth.me/writings/big-numbers/
1•Seneth•21m ago•0 comments

CRTs and other ewaste can no longer be exported from the USA

https://twitter.com/techknight2/status/2085434346501001668
1•tosh•27m ago•0 comments

The AI slowdown is coming

https://www.transformernews.ai/p/the-ai-slowdown-is-coming
1•reasonableklout•29m ago•0 comments

The Event of 2033 – An AI-Imagined Second Coming

https://www.amazon.com/dp/B0HCN65Q57
1•aimasterpiece•34m ago•0 comments

90 second power loss causing second day of train disruption

https://www.bbc.co.uk/news/live/cwy0d0wgy4xt
2•rwmj•39m ago•1 comments

Why and how the Austrian Military moved to LibreOffice (Part 1)

https://blog.documentfoundation.org/blog/2026/08/07/why-and-how-the-austrian-military-moved-to-li...
5•mksaunders2•40m ago•0 comments

DeepSeek V4 Flash 0731: Is It Cheaper to Run It at Home or Pay per Token?

https://grigio.org/deepseek-v4-flash-0731-is-it-cheaper-to-run-it-at-home-or-pay-per-token/
1•grigio•41m ago•1 comments

All memory manufactured in 2027 has been sold out

https://www.ign.com/articles/ramageddon-continues-another-year-as-2027-memory-capacity-is-reporte...
13•inigyou•41m ago•1 comments

Is your Bitcoin seed safe after Coldcard accident? What about iancoleman/bip39?

https://grigio.org/is-you-bitcoin-seed-safe-after-coldcard-accident-what-about-iancoleman-bip39/
1•grigio•42m ago•1 comments

Truckslop

https://truckslop.joshu.dev/
1•tosh•42m ago•0 comments

Marque Terminal

https://marque.at/download
1•scanash00•44m ago•0 comments

The Ones Who Look Outward

https://www.centauri-dreams.org/2026/08/06/the-ones-who-look-outward/
2•JPLeRouzic•46m ago•0 comments

Tsang Tsou-Choi

https://en.wikipedia.org/wiki/Tsang_Tsou-choi
1•bondarchuk•48m ago•0 comments

Show HN: Remembrane – agent memory in one SQLite file, zero dependencies

https://github.com/satyasairay/remembrane
3•satyasairay•48m ago•0 comments

Windows Tracks You with Hidden ID. We Built DeGDID to Block It

https://windscribe.com/blog/windows-tracks-you-with-a-hidden-id-so-we-built-degdid-to-block-it/
2•defrost•49m ago•0 comments

AI model achieves breakthrough in forecasting cyclones – Google DeepMind

https://deepmind.google/blog/weathernext-ai-model-achieves-breakthrough-in-forecasting-cyclones/
1•rbanffy•50m ago•0 comments