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.

Box of 300 Love Letters Showed Up, What Whimsical WWII Soldier Who Wrote Them?

https://www.smithsonianmag.com/history/this-box-of-300-love-letters-showed-up-out-of-the-blue-who...
1•gmays•2m ago•0 comments

Thomson Reuters Launches Its Own Frontier Model

https://www.thomsonreuters.com/en/press-releases/2026/august/thomson-reuters-leverages-its-world-...
2•giuliomagnifico•8m ago•0 comments

80% of developers find AI coding more addictive than helpful

https://www.zdnet.com/article/i-cant-stop-80-of-developers-find-ai-coding-more-addictive-than-hel...
4•jethronethro•10m ago•0 comments

MTIA 300: Meta's First Training Chip with Built-In NICs

https://engineering.fb.com/2026/08/24/networking-traffic/mtia-300-meta-training-chip-built-in-nics/
1•sbulaev•12m ago•0 comments

How to Route a DDR3 PCB [video]

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

Younger, lower-income entrepreneurs driving an increasing share of new ventures

https://institute.bankofamerica.com/economic-insights/new-generation-of-business-formation.html
2•keeda•13m ago•0 comments

Apparent Elon Musk Pep Talk to His Cursor Staff Paints Sad Picture

https://gizmodo.com/not-used-to-losing-apparent-elon-musk-pep-talk-to-his-cursor-staff-paints-sad...
3•toomanyrichies•16m ago•0 comments

"Tomorrow we will bring back the 5h limit for Plus across ChatGPT Work/Codex."

https://twitter.com/thsottiaux/status/2092058556707344708
1•minimaxir•16m ago•1 comments

Walmart Waves the White Flag to Apple Pay

https://www.aboveavalon.com/notes/2026/8/24/walmart-waves-the-white-flag-to-apple-pay
1•supster•19m ago•0 comments

Attention-I made a new chess engine tool

https://github.com/heinevwinston-bot/Chess-Cheat-live-board-analyzer
1•WinstoneH•20m ago•0 comments

The Global Birth Crash

https://www.aei.org/research-products/report/the-incredible-global-birth-crash/
1•toomuchtodo•20m ago•0 comments

Show HN: Networthy – net-worth tracker that runs on your machine, not my server

https://github.com/awmanoj/networthy
1•awmanoj•25m ago•0 comments

SK hynⅸ ru㎱ out of replacement SSDs and defaults to orig㏌al purc㏊se price refund

https://www.tomshardware.com/pc-components/ssds/sk-hynix-is-allegedly-out-of-replacement-ssds-for...
2•MiguelX413•30m ago•0 comments

PromoteOps MCP – Compare and promote AWS CloudFormation stacks across envs

https://www.npmjs.com/package/promoteops
1•HiteshShinde26•34m ago•0 comments

Bulgaria neutralizes GPS jammer that suppressed Sofia Airport signals

https://www.aerotime.aero/articles/bulgaria-sofia-gps-jammer-aircraft-navigation
2•r2sk5t•36m ago•0 comments

Let the Bond Market Speak

https://www.wsj.com/opinion/let-the-bond-market-speak-81529d74
1•gmays•37m ago•0 comments

Multiplatform Speech Recognition Runtime

https://github.com/k2-fsa/sherpa-onnx
1•measurablefunc•37m ago•0 comments

BMW Exec: Young People Prefer Voice and Screens over Buttons

https://www.thedrive.com/news/bmw-exec-says-young-people-prefer-voice-and-screens-over-buttons-be...
2•cf100clunk•39m ago•4 comments

How Universities Should Prepare Founders

https://paulgraham.com/prepare.html
18•gmays•39m ago•9 comments

Patreon Sends 1.1 MB of JSON to Show You 75 Chat Messages

https://www.joey.fyi/blog/patreon-ships-1mb-of-json
1•rpst•39m ago•0 comments

Was Modern Art a CIA Psy-Op?

https://daily.jstor.org/was-modern-art-really-a-cia-psy-op/
2•neom•45m ago•0 comments

Nvidia Vera Rubin NVL72 Rack at Hot Chips 2026

https://www.servethehome.com/nvidia-vera-rubin-nvl72-rack-at-hot-chips-2026/
2•pella•47m ago•0 comments

AMD Helios MI400 System Architecture at Hot Chips 2026

https://www.servethehome.com/amd-helios-mi400-system-architecture-at-hot-chips-2026/
3•pella•48m ago•0 comments

AMD MI400 GPU at Hot Chips 2026

https://www.servethehome.com/amd-mi400-gpu-at-hot-chips-2026/
2•pella•49m ago•0 comments

Protesting PS5 players now plan permanent blackout

https://www.pushsquare.com/news/2026/08/protesting-ps5-players-now-plan-permanent-blackout-meanin...
2•anigbrowl•51m ago•1 comments

Paying for Cached Tokens Sucks

https://twitter.com/lafalcemateo/status/2092061073750782139
1•lafalce•51m ago•0 comments

Enterprise AI Operating System

https://devnavigator.com/2026/08/25/enterprise-ai-operating-system/
1•devnavigator•54m ago•0 comments

Russian drone guided by AI kills civilians in Ukraine

https://www.aerotime.aero/articles/russian-drone-guided-entirely-by-ai-kills-civilians-in-ukraine
2•r2sk5t•1h ago•1 comments

I turned a crappy movie tracking spreadsheet for my friends into website

https://jesse.id/blog/my-friends-and-i-take-turns-picking-movies-to-watch-i-converted-our-crappy-...
2•jesse_dot_id•1h ago•0 comments

Some purchased movies on AppleTV are no longer accessible

https://twitter.com/AntoineRichard/status/2091845412151771449
4•erickhill•1h ago•0 comments