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.

ArXiv has almost 600 submissions today and most are AI slop

https://arxiv.org/list/math/new
1•marysminefnuf•4m ago•0 comments

Show HN: Eatheria – Self-hosted AppSec platform with AI false-positive filtering

https://github.com/MartinCrespoC/Security-Team---Workspace-
1•ikharoz•7m ago•0 comments

Show HN: OpenRouter for Sandboxes – Get sandboxes from any provider in seconds

https://reachpad.dev/router
2•sakuraiben•9m ago•0 comments

I Went on an AI Show. It Made Me Feel Better About Human News

https://www.upstartsmedia.com/p/the-good-bad-ugly-of-24-hour-ai-news
1•thm•10m ago•0 comments

Why Migrants Tend to Make the Countries They Move to Like the Ones They Left

https://twitter.com/williameijer/status/2094531862245069246
2•MrBuddyCasino•18m ago•0 comments

GEIPAN – French government UFO investigations

https://www.cnes-geipan.fr/en/missions-methodes-et-resultats
2•andsoitis•19m ago•0 comments

The single biggest change I made to the Jock compiler between Alpha and RC

https://twitter.com/sigilante/status/2094559940778348682
1•MrBuddyCasino•19m ago•0 comments

Program Learning with Verifiable Rewards: Symbolic Backpropagation

https://arxiv.org/abs/2608.28421
1•sbulaev•21m ago•0 comments

OpenAI story as anti-hero heist story?

https://uphack.io/blog/post/the-hugging-face-incident-is-not-an-ai-story/
1•dickiedyce•22m ago•0 comments

LogRange C++ log-domain accumulators and a scanner for underflowing sums

https://github.com/iouel/logrange
1•cheIs•28m ago•0 comments

Joining AMI to Work on World Models

https://www.lihaoyi.com/post/JoiningAMItoworkonWorldModels.html
1•lihaoyi•30m ago•0 comments

Show HN: Serendipity – rediscover the web one interesting page at a time

https://serendipity.surf/
2•RaCaS123•36m ago•0 comments

Lionel Messi announces retirement from Argentina's national team

https://www.washingtonpost.com/sports/2026/08/31/soccer-great-lionel-messi-announces-retirement-a...
3•MehrdadKhnzd•38m ago•0 comments

The Ur Project - Notes on building a new Linux distribution

https://ur.foo-projects.org/
2•9front•40m ago•0 comments

Show HN: Seatlr – We rebuilt our traveler chat into an AI-powered travel network

https://www.seatlr.com/
2•alihadi965•42m ago•0 comments

Paint.NET Adds Experimental Wine/Linux Support

https://forums.paint.net/topic/134563-%F0%9F%8D%B7-extremely-experimental-winelinux-support-how-t...
5•tech234a•45m ago•0 comments

Show HN: I Built the AI command center that runs all local models in one place

https://generativeide.com/
2•rohangnaneshjh•46m ago•0 comments

Intelligence Without Brains [video]

https://aeon.co/videos/why-we-should-think-of-intelligence-in-terms-of-goals-not-brains
2•the-mitr•46m ago•0 comments

Ask HN: Why are the high rep people on HN so stupid?

5•LowIqHn•47m ago•3 comments

io_uring without readahead

https://frn.sh/io-uring/
3•theanonymousone•56m ago•0 comments

Yiddish's 'revival' points to its resilience as a portable homeland

https://theconversation.com/yiddishs-revival-points-to-its-resilience-as-a-portable-homeland-and-...
3•theanonymousone•1h ago•0 comments

Power Users in 2026

https://nullish.smol.pub/power-users-in-2026
2•meetpateltech•1h ago•0 comments

I Built a Bullet Journal Habit Tracker Tool After Realizing How Much Time Spend

https://www.indiehackers.com/post/i-built-a-bullet-journal-habit-tracker-tool-after-realizing-how...
2•ahmadhussain89•1h ago•0 comments

Restroom Archive

https://restroomarchive.com
10•jcalx•1h ago•1 comments

CISA confirms hackers targeted over 100 US water systems during July

https://techcrunch.com/2026/08/26/cisa-confirms-hackers-targeted-over-100-us-water-systems-during...
4•deepmem•1h ago•0 comments

Two Alleged 'TeamPCP' Hackers Arrested in Australia

https://krebsonsecurity.com/2026/08/two-alleged-teampcp-hackers-arrested-in-australia/
2•e12e•1h ago•0 comments

GPU World

https://www.gpuworld.org/
3•simonpure•1h ago•0 comments

Sliding-window beats linear attention

https://arxiv.org/abs/2608.28444
2•simonpure•1h ago•0 comments

Running a personal AI agent on an old Android phone instead of a server

https://medium.com/@fsaint/the-best-home-for-your-agent-is-in-your-junk-drawer-3afe0b0976e8
2•fsaint•1h ago•0 comments

OpenTS is a new open-source reconstruction of Command and Conquer: Tiberian Sun

https://www.gamingonlinux.com/2026/08/opents-is-a-new-open-source-reconstruction-of-command-conqu...
7•geoffbp•1h ago•0 comments