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

Comments

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

Neat.

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

https://stacked-git.github.io

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

Balcony solar can help renters and homeowners save money

https://theconversation.com/how-balcony-solar-can-help-renters-and-homeowners-save-money-281620
1•PaulHoule•1m ago•0 comments

Malicious node-IPC Versions Published to NPM

https://github.com/RIAEvangelist/node-ipc/issues/15
1•varunsharma07•1m ago•0 comments

The Tarot Card Deck Created by Salvador Dalí

https://www.openculture.com/2026/05/salvador-dali-tarot-card-deck.html
1•Brajeshwar•1m ago•0 comments

David Turner (2019) Some History of Functional Programming Languages [video]

https://www.youtube.com/watch?v=ezFZIPuSQU8
1•emigre•3m ago•0 comments

Show HN: CrunchyCleaner – A cross-platform TUI tool to purge software caches

https://github.com/Knuspii/CrunchyCleaner
1•Knuspii•4m ago•0 comments

May I recommend understanding Emacs's patterns

https://www.chiply.dev/post-emacs-carnival-may
1•chiply•4m ago•1 comments

Show HN: Yes We Scan: rescue old scanners with an in-browser Linux VM and WebUSB

https://yes-we-scan.app/
2•gmac•5m ago•1 comments

What happens when you post a real Monet and say it's AI?

https://twitter.com/SHL0MS/status/2054280631807316329
1•thinkingemote•6m ago•0 comments

ML with Rust and Category Theory

https://hghalebi.github.io/category_theory_transformer_rs/
1•adamnemecek•7m ago•0 comments

Accenture joins IBM in battle for £323M Post Office Horizon deal

https://www.computerweekly.com/news/366642986/Accenture-joins-IBM-in-battle-for-323m-Post-Office-...
1•latein•7m ago•0 comments

Let's maybe not defund universities (2025)

https://12gramsofcarbon.com/p/silicon-valley-is-wrong-about-federal
1•theahura•7m ago•0 comments

VNote, a Qt-based, free and open source note-taking application

https://github.com/vnotex/vnote
2•htfy96•7m ago•0 comments

Microsoft AntiSSRF

https://github.com/microsoft/AntiSSRF
1•campuscodi•11m ago•0 comments

US charges suspected Dream Market admin arrested in Germany

https://www.bleepingcomputer.com/news/security/us-charges-suspected-dream-market-admin-arrested-i...
1•Brajeshwar•11m ago•0 comments

HDD Firmware Hacking

https://icode4.coffee/?p=1465
2•jsploit•12m ago•0 comments

Datadog scales time series foundation models to 2.5B parameters

https://huggingface.co/Datadog/Toto-2.0-2.5B
2•chrisdevs•12m ago•1 comments

When Skill Is Free, Expression Wins [video]

https://www.youtube.com/watch?v=DIn34a9TSGU
1•domrdy•15m ago•0 comments

Arrive by skeletonics is a 9-feet-tall kinetic exoskeleton

https://www.designboom.com/technology/arrive-skeletonics-kinetic-exoskeleton-04-20-2022/
2•thunderbong•15m ago•0 comments

GLiNER2-PII: 0.3B open-source PII model outperforms OpenAI's Privacy Filter

https://pioneer.ai/research/gliner2-pii-a-multilingual-model-for-personally-identifiable-informat...
1•neon_share1•16m ago•1 comments

PHPantom: A PHP LSP Written in Rust

https://github.com/AJenbo/phpantom_lsp
2•Einenlum•18m ago•0 comments

How to Just Do a Thing

https://www.raptitude.com/2026/05/how-to-just-do-a-thing/
2•crescit_eundo•19m ago•0 comments

Langwag: Learn a Language from News Stories

https://langwag.com/en
2•danosull•20m ago•1 comments

Dell confirms its SupportAssist software causes Windows BSOD crashes

https://www.bleepingcomputer.com/news/software/dell-confirms-its-supportassist-software-causes-wi...
1•Brajeshwar•20m ago•0 comments

VectorSmuggle: Steganographic exfiltration in vector embedding stores

https://arxiv.org/abs/2605.13764
1•smugglereal•21m ago•0 comments

I cut my OpenRouter bill 43% by fixing my own prompts. Then shipped the tool

https://fixmyprompt.net/
1•chewymole•22m ago•0 comments

From latency to instant: Modernizing GitHub Issues navigation performance

https://github.blog/engineering/architecture-optimization/from-latency-to-instant-modernizing-git...
1•soheilpro•22m ago•0 comments

The Graveyard of the Internet

https://doublespeed.ai/
1•nwhnwh•22m ago•0 comments

Httpx2

https://tildeweb.nl/~michiel/httpx2.html
1•thm•24m ago•0 comments

The Agent Is a Workflow That Writes Itself

https://www.getauctor.com/blog/the-agent-is-a-workflow-that-writes-itself
6•tjbai•24m ago•0 comments

Interrogatory LLM

https://martinfowler.com/bliki/InterrogatoryLLM.html
1•soheilpro•24m ago•0 comments