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

Comments

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

Neat.

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

https://stacked-git.github.io

johnisgood•9mo 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: Cursor-Tg – Run Cursor Cloud Agents from Telegram

https://github.com/tb5z035i/cursor-tg
1•tb5z035i•1m ago•0 comments

MoltBrowser MCP

https://github.com/Joakim-Sael/moltbrowser-mcp
2•geobotPY•2m ago•1 comments

Show HN: FretBench – I tested 14 LLMs on reading guitar tabs. Most failed

https://fretbench.tymo.ai/blog/i-asked-14-ai-models-to-read-guitar-tabs/
1•jmcapra•3m ago•0 comments

Show HN: NirvaCrop – Offline Python tool for batch video cropping

https://nirvasoft.gumroad.com/l/ffdoc
1•Ashwiniakash•4m ago•1 comments

A sneak preview behind an embedded software factory. I suspect "rad" is back

https://ghuntley.com/rad/
1•ghuntley•11m ago•0 comments

Sumi – Open-source voice-to-text with local AI polishing

1•alkd•11m ago•0 comments

Show HN: U-Claw – An Offline Installer USB for OpenClaw in China

https://www.u-claw.org/
1•17vibe•13m ago•0 comments

Replaced by a Goldfish

https://clawd.it/posts/10-replaced-by-a-goldfish/
1•patrikgro•16m ago•0 comments

Why AI Agents Need Email Guardrails

https://molted.email/blog/why-ai-agents-need-email-guardrails
1•spacesh1psoda•16m ago•0 comments

SQLite: Query Result Formatting in the CLI

https://www.sqlite.org/climode.html
1•thunderbong•18m ago•0 comments

Seedance2.0 and OmniVideo: AI video creation from text and images – experiences?

1•hongxiao•19m ago•0 comments

Kairos – real-time AI that cross-verifies news before answering (Python, 90KB)

1•joshuaveliyath•21m ago•0 comments

A short guide to email opening lines

https://www.economist.com/business/2026/03/05/a-short-guide-to-email-opening-lines
1•petethomas•24m ago•0 comments

MiniMax Music 2.5 – AI Music Generation Model for Fast Song Creation

https://www.minimax-music.com/minimax-music-2-5
2•cy20251210•25m ago•1 comments

Is Europe's AI Darling Mistral Becoming a Consultant?

https://www.bloomberg.com/news/newsletters/2026-03-03/europe-s-ai-darling-mistral-looks-more-like...
2•flawn•26m ago•1 comments

How I built a free flight simulator that runs in the browser

https://worldflightsim.com/blog/free-flight-simulator-browser
1•fmfamaral•27m ago•0 comments

Show HN: OpenCode Benchmark Dashboard

https://github.com/grigio/opencode-benchmark-dashboard
1•grigio•29m ago•0 comments

Show HN: Supaguard – AI agent that writes and repairs Playwright tests

https://supaguard.app
2•maddhruvhn•33m ago•0 comments

Ka'ak, and the Case for the Ancient Arabic Origins of the Bagel (2023)

https://www.seriouseats.com/kaak-ancient-bagel-arabic-origins
2•notagoodidea•34m ago•0 comments

Show HN: Simple spec driven development for Claude

https://tinyspec.dev/
1•natedaines•35m ago•0 comments

We Stopped Using the Mathematics That Works

https://gfrm.in/posts/why-decision-theory-lost/index.html
1•slygent•39m ago•0 comments

QGIS 4.0 Visual Changelog [video]

https://www.youtube.com/watch?v=wTK1exokBA8
1•marklit•39m ago•0 comments

A simple rule set that fixes Claude Code's worst habits

https://github.com/akinalpfdn/claude-ground
2•akinalpfdn•40m ago•0 comments

Show HN: CiderStack – Run macOS CI runners on your own Mac mini cluster

https://github.com/ciderstack/Brew
2•ciderdev•42m ago•0 comments

MARL: Runtime Middleware That Reduces LLM Hallucination Without Fine-Tuning

https://huggingface.co/blog/FINAL-Bench/marl-middleware
1•seawolf2357•45m ago•0 comments

My little SaaS made $239 in 7 days (Story)

1•Sayyidalijufri•45m ago•0 comments

Just crossed 2k NPM downloads and shipped the biggest Cognetivy upgrade yet

https://cognetivy.com/
1•meitarbe•47m ago•1 comments

Show HN: Botais (Battle of the AI's) – Competitive Snake Game for LLMs

https://botais.sello.dev
1•giza182•54m ago•1 comments

Why octal notation should be used for UTF-8 (and Unicode)

https://movq.de/blog/postings/2016-10-05/0/POSTING-en.html
1•u1hcw9nx•55m ago•0 comments

Show HN: Husky hook that blocks Git push until you do your pushups

https://git-push.app
2•zimboy•57m ago•0 comments