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.

The Phenomenology of Early Childhood Experience

https://medium.com/@smoking2man/the-phenomenology-of-early-childhood-experience-feeling-as-an-ins...
1•Aldus551•3m ago•0 comments

CTO of 'RansomwareHelp' Indicted for Wire Fraud

https://krebsonsecurity.com/2026/11/cto-of-ransomwarehelp-indicted-for-wire-fraud/
1•Brajeshwar•5m ago•0 comments

Show HN: Pantry an open source scanner that checks what your coding agents run

https://waffuru.ai/products/pantry
1•ekryski•6m ago•0 comments

The Defender's Window

https://blog.gregbrockman.com/the-defenders-window
1•fagnerbrack•8m ago•0 comments

Platonic space: where cognitive and morphological patterns come from

https://thoughtforms.life/platonic-space-where-cognitive-and-morphological-patterns-come-from-bes...
1•myth_drannon•17m ago•0 comments

Ask HN: Rust, Zig, or C?

3•selectedambient•24m ago•1 comments

Surprisingly Adorable Insect Portraits

https://amateurphotographer.com/latest/these-astonishing-insect-portraits-reveal-a-hidden-world-y...
2•NordStreamYacht•25m ago•0 comments

Making Neurons by Hand

https://vgel.me/notebook/making-neurons-by-hand/
2•pr337h4m•37m ago•0 comments

Oxford and MIT Didn't Bite. So Ken Griffin Took His Miami Campus Elsewhere

https://www.wsj.com/business/ken-griffin-citadel-miami-carnegie-mellon-338bcd20
2•ryan_j_naughton•40m ago•0 comments

I Tracked Down All 60 Birds in GTA 6: A Birder's Guide to Vice City's Wildlife

https://www.audubon.org/magazine/birds-of-gta-6-field-guide-vice-city-wildlife
2•Brajeshwar•44m ago•0 comments

Explore Riemann

https://exploreriemann.com/
2•judegomila•45m ago•0 comments

HTTP/1.1 Must Die

https://http1mustdie.com/
3•doodlesdev•45m ago•1 comments

Aletheia Aegis: Deterministic sub-millisecond output guard for AI agents

https://github.com/vikasny30/aletheia-aegis
1•vikasny30•47m ago•0 comments

Who's making all of the money in the porn industry? [video]

https://www.youtube.com/watch?v=3IsgwsuV_nE
1•cisc•54m ago•0 comments

Turn a Bambu Lab P1S 3D printer into a pen plotter

https://github.com/gtls64/p1s-pen-plotter
1•gtls64•56m ago•1 comments

I'm building GURU, a framework for a personal AI that lives alongside you

https://github.com/GuruProduction/GURUbyUnusLumen
1•introducingGURU•56m ago•0 comments

Federal Revenue When AI Replaces Labor

https://www.rand.org/pubs/research_reports/RRA4980-1.html
3•littlexsparkee•57m ago•1 comments

Bell says it's investigating cyberattack that led to potential theft of data

https://www.cbc.ca/news/business/bell-agentic-cyber-attack-9.7430468
2•MadrasThorn•1h ago•0 comments

Scaling horizontally: how we moved beyond Multi-Raft

https://enroute.sh/blog/scaling-horizontally-how-we-moved-beyond-multi-raft
1•Brajeshwar•1h ago•0 comments

Show HN: Sniffy – a free AI detector and Chrome extension

https://getsniffy.com/
1•vood•1h ago•0 comments

Ask HN: Has the quality of HN content/discussions gone down?

1•sandeepkd•1h ago•1 comments

Testing Gemini 4 Hydrogen and Argon vs. Gen 3 over 1,474 Multi-Turn Queries

https://zenodo.org/records/24412128
2•IndependentRese•1h ago•0 comments

Show HN: Musset, open-source Scrivener alternative with an AI that never writes

https://github.com/Musset-App/musset
2•julienmarie•1h ago•0 comments

Manage Kubernetes Clusters for GPU Infrastructure with Nvidia Kubernetes Engine

https://developer.nvidia.com/blog/manage-kubernetes-clusters-for-gpu-infrastructure-with-nvidia-k...
2•teleforce•1h ago•0 comments

Broadcom open-sources its Kubernetes VM manager

https://siliconangle.com/2026/11/09/broadcom-open-sources-its-kubernetes-vm-manager/
1•teleforce•1h ago•0 comments

ClawDOS – An AI coding agent for DOS

http://ricapar.net/ClawDOS/
16•Ricapar•1h ago•2 comments

Dutch Court Bars Chinese SUV in Europe over Resemblance to Land Rover Defender

https://www.reuters.com/world/china/chinas-byd-has-suv-that-infringes-jlr-defender-design-dutch-c...
1•teleforce•1h ago•0 comments

Splice-Core: Low-Order-Bit-Splicing GEMM for Energy-Efficient AI Accelerators

https://arxiv.org/abs/2611.25617
1•matt_d•1h ago•0 comments

Make America Function Again

https://www.thenation.com/article/politics/make-america-function-again/
3•worik•1h ago•0 comments

The logic of Buddhist philosophy (2014)

https://aeon.co/essays/the-logic-of-buddhist-philosophy-goes-beyond-simple-truth
2•sammatilda•1h ago•0 comments