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