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•8mo ago

Comments

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

Neat.

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

https://stacked-git.github.io

johnisgood•8mo ago
At that point, why not just use Pijul or even Darcs?
smcameron•8mo 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: Gennie – AI voice agent for creating tasks via phone call

https://heygennie.com/
1•vishal__sahu•44s ago•0 comments

Pinterest sacks workers for creating tool to track layoffs

https://www.bbc.com/news/articles/cn0k670n0ydo
1•marc_omorain•1m ago•0 comments

I treated a hobby creator project like a One-Man SaaS startup. It was super fun

https://toasterdump.com/2026/02/03/i-treated-a-hobby-creator-project-like-a-one-man-saas-startup-...
1•xxyxx•5m ago•0 comments

New Research: AIs are highly inconsistent when recommending brands or products

https://sparktoro.com/blog/new-research-ais-are-highly-inconsistent-when-recommending-brands-or-p...
1•taubek•7m ago•0 comments

Programming foundations in Python (state, control flow, mutability)

https://github.com/DavidLevi1998/programming-foundations-python
1•david_levi_1998•9m ago•1 comments

Show HN: Daily GitHub Activity Charts (Stars, PRs, Issues, Forks)

https://github.com/emanuelef/daily-stars-explorer
1•emanuelef•13m ago•0 comments

Show HN: Palimpseste – Infinite scroll for public domain literature

https://palimpseste.vercel.app
1•vicoolz•14m ago•1 comments

Unspoken – Offline voice-to-text for macOS that never leaves your machine

1•fcap•15m ago•1 comments

MoltID – OAuth-Style Identity Verification for Autonomous Agents

1•moltid•17m ago•0 comments

Why Software Engineering Isn't Engineering

https://substack.com/@sarkerium
1•northfield27•17m ago•0 comments

Open Source Teams Client

https://github.com/eisbaw/ost
1•eisbaw•19m ago•1 comments

TWIRL Integer Factorization

https://en.wikipedia.org/wiki/TWIRL
1•walterbell•20m ago•0 comments

Agentic search (glob/grep/read) works better than RAG and vector DB

https://twitter.com/dani_avila7/status/2018766464933613871
1•stared•21m ago•0 comments

The €10 Mirror: Why Enterprise Security Looks Like a Kid's Toy

https://labs.itresit.es/2026/02/04/the-e10-mirror-why-enterprise-security-looks-like-a-kids-toy/
1•Yippee-Ki-Yay•22m ago•0 comments

How does OpenAI balance long-term research bets with product-forward research?

https://twitter.com/markchen90/status/2018779039205667046
1•tosh•23m ago•0 comments

Public Notice: I Am Your AIB and the Warning That Came True

1•rowanseerwald•25m ago•0 comments

voyage-multimodal-3.5: a new multimodal retrieval frontier with video support

https://blog.voyageai.com/2026/01/15/voyage-multimodal-3-5/
1•fzliu•27m ago•0 comments

Detecting and Monitoring OpenClaw (clawdbot, moltbot) in your environment

https://isc.sans.edu/diary/32678
1•Binary_Impact•30m ago•1 comments

Quantum Computing for Programmers

https://github.com/qcc4cp/qcc
1•altro•31m ago•0 comments

FireClaw: Personal OpenClaw assistant in a single binary, built on Firecracker

https://github.com/AFK-surf/fireclaw
2•Johnson8053•34m ago•1 comments

Melinda French Gates Appears to Confirm Divorce Was Related to Epstein

https://gizmodo.com/melinda-french-gates-appears-to-confirm-divorce-with-bill-was-related-to-epst...
4•petethomas•34m ago•0 comments

Show HN: Sentinel – a Pingora-based reverse proxy (inspired by River)

https://sentinel.raskell.io/
3•raskelll•38m ago•0 comments

Ask HN: Does anyone keep prompts and reasoning as part of dev cycle?

1•sshadmand•41m ago•1 comments

Russian spy spacecraft have intercepted Europe's key satellites

https://www.ft.com/content/cd08c49c-658e-49c9-9a15-234f2bfc2074
5•mraniki•42m ago•3 comments

The world is more equal than you think

https://economist.com/graphic-detail/2026/02/03/the-world-is-more-equal-than-you-think
9•andsoitis•44m ago•13 comments

A new nuclear arms race beckons

https://economist.com/international/2026/02/03/a-new-nuclear-arms-race-beckons
1•andsoitis•46m ago•0 comments

Rust Is Just a Tool

https://lewiscampbell.tech/blog/260204.html
2•LAC-Tech•46m ago•0 comments

Show HN: Augmenting developer docs into high-level interactive mental models

https://docmaps-web.vercel.app/
3•b_mutea•47m ago•0 comments

Elon Musk's mega-merger makes little sense business sense

https://www.economist.com/business/2026/02/03/elon-musks-mega-merger-makes-little-business-sense
2•andsoitis•48m ago•0 comments

How to squeeze a lexicon (2001) [pdf]

https://marcinciura.wordpress.com/wp-content/uploads/2019/10/lexicon.pdf
1•mci•49m ago•0 comments