frontpage.
newsnewestaskshowjobs

Made with ♥ by @iamnishanth

Open Source @Github

fp.

Open in hackernews

Working with Git Patches in Apple Mail (2023)

https://btxx.org/posts/mail/
50•todsacerdoti•10mo ago

Comments

johnrob•10mo 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•10mo ago
Oh that’s clever, I’ll try that out. Looks like you could just do a git diff > file.patch.

Neat.

johnrob•10mo 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•10mo 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•10mo 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•9mo 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•10mo 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•10mo ago
That’s a great idea, and very timely for me.
d3ckard•10mo ago
Thank you, will try. Useful bit of knowledge.
OskarS•10mo 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•10mo 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•10mo ago
Generating app passwords for those would work.
pm215•10mo 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•10mo ago
For Gmail, you can use https://github.com/google/gmail-oauth2-tools/tree/master/go/....
mathstuf•10mo 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•10mo ago
davmail supports smtp through outlook(365)
ndegruchy•10mo 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•10mo 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•10mo ago
I use an app password but https://github.com/AdityaGarg8/git-credential-email apparently supports OAuth with Gmail, yahoo and outlook
arthurmorgan123•10mo 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.

palata•10mo 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•10mo 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•10mo 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•10mo ago
If you work with git and patches a lot, stgit is worth a look.

https://stacked-git.github.io

johnisgood•10mo ago
At that point, why not just use Pijul or even Darcs?
smcameron•9mo 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/

Show HN: Deathwatch, a CLI to detect abandoned dependencies

https://github.com/davitotty/deathwatch
1•Davitotty1•1m ago•0 comments

Lotus Notes Tribunal, Exhibit 001B: Login Screen Animation (2011)

http://depressedpress.com/2011/03/07/lotus-notes-tribunal-exhibit-001-b-login-screen-animation/
1•themaxdavitt•1m ago•0 comments

Jürgen Habermas, German philosopher and sociologist, dies aged 96

https://www.theguardian.com/world/2026/mar/14/jurgen-habermas-german-philosopher-and-sociologist-...
1•naves•2m ago•0 comments

Warming and farming hasten bird losses across North America, study shows

https://news.mongabay.com/short-article/2026/02/warming-and-farming-hasten-bird-losses-across-nor...
1•PaulHoule•2m ago•0 comments

Jürgen Habermas Dies at 96; One of Postwar Germany's Most Influential Thinkers

https://www.nytimes.com/2026/03/14/books/jurgen-habermas-dead.html
1•naves•3m ago•0 comments

The POC Valley

https://deploy95.substack.com/p/introducing-the-poc-valley
1•dddddaviddddd•3m ago•0 comments

Can a "Living Drug" Cure Autoimmune Diseases?

https://www.newyorker.com/culture/annals-of-inquiry/can-a-living-drug-cure-autoimmune-diseases
1•mitchbob•4m ago•1 comments

Free LLM cost calculator – what your AI product costs across providers

https://ai-cost-audit.vercel.app
1•eka_aibuilder•4m ago•1 comments

Recommended workbook for those of you interested in Japanese

https://tuttlepublishing.com/language/writing-japanese-hiragana
1•programmexxx•5m ago•0 comments

The most brilliant move in corporate history?

https://asymco.com/2026/03/10/the-most-brilliant-move-in-corporate-history/
1•frizlab•5m ago•0 comments

I use the 'cupcake' prompt to catch when AI is guessing

https://www.tomsguide.com/ai/i-use-the-cupcake-prompt-to-catch-when-ai-is-guessing-heres-how-it-w...
1•colinprince•6m ago•0 comments

Creating a biologically-inspired AI system from the ground up

https://millionminds.one
1•jv22222•7m ago•0 comments

Being Stomp Agnostic

https://zkc.se/blog/stomp-agnostic/
1•jonasdn•8m ago•0 comments

Mel Frequency Cepstral Coefficients

https://blog.spencersalazar.com/archive/mel-frequency-cepstral-coefficients/
1•ssalazar•12m ago•0 comments

You Will Never Look at T Shirts the Same [video]

https://www.youtube.com/watch?v=CMoZjcpgivM
1•And1•13m ago•0 comments

The "are you sure?" Problem: Why AI keeps changing its mind

https://www.randalolson.com/2026/02/07/the-are-you-sure-problem-why-your-ai-keeps-changing-its-mind/
2•turoczy•15m ago•0 comments

Wallstreetbets for AI Agent – 1k post/predict

https://x.com/bots_of_wallst
1•nykodev•16m ago•0 comments

Tons of new LLM bot accounts here

4•koolala•18m ago•1 comments

Personal Learning about Context Engineering

https://apurva-mishra.com/posts/5/
1•mav3ri3k•18m ago•0 comments

To Sparsify or to Quantize: A Hardware Architecture View

https://www.sigarch.org/to-sparsify-or-to-quantize-a-hardware-architecture-view/
1•jruohonen•19m ago•0 comments

Claude Code won't go away but I'm certain the damage reach its maximum soon

https://skywriter.blue/@emily.gorcen.ski/3mh24do2prk2h
4•mooreds•24m ago•0 comments

OpenLobster – Go Rewrite of OpenClaw with Neo4j, OAuth 2.1, Proper RBAC

https://github.com/Neirth/OpenLobster
2•neirth•29m ago•2 comments

The Mistake Picnic

https://www.howardgray.net/the-mistake-picnic/
1•walterbell•29m ago•0 comments

Multi-model AI API for detecting stereotypes and toxic language

1•hkindt•30m ago•1 comments

Show HN: OpenLegion – AI agent fleet with container isolation and vault proxy

https://www.openlegion.ai
1•curiouscake•30m ago•0 comments

The Most Interesting Fund in the World

https://mayankagrawalphd.substack.com/p/the-most-interesting-fund-in-the
2•timshell•33m ago•0 comments

An experiment about an LLM driven robot

https://github.com/leonardosalvatore/StrandedBot
2•Pasyd•33m ago•1 comments

Thiel's secretive Rome conference draws Church attention

https://www.reuters.com/technology/thiels-secretive-rome-conference-draws-church-attention-2026-0...
5•devonnull•35m ago•0 comments

Happy Map

https://pudding.cool/2026/02/happy-map/
3•gmays•35m ago•0 comments

Solving AI Sprawl: Using Git Worktrees and ADRs to Govern Parallel Agents

https://www.arnaudp.dev/solving-ai-sprawl-using-git-worktrees-and-adrs-to-govern-parallel-agents-2/
3•gentle_bubble•36m ago•1 comments