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•3h ago
Oh that’s clever, I’ll try that out. Looks like you could just do a git diff > file.patch.
Neat.
johnrob•3h 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”:
<<<<<<<<<
=========
>>>>>>>>>
johannes1234321•1h 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•3h ago
That’s a great idea, and very timely for me.
d3ckard•3h ago
Thank you, will try. Useful bit of knowledge.
teeray•4h 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)
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.
johnrob•4h ago
barbazoo•3h ago
Neat.
johnrob•3h ago
<<<<<<<<<
=========
>>>>>>>>>
johannes1234321•1h ago
RaoulP•3h ago
d3ckard•3h ago