"I think the problem here is that we have someone on the autism scale, talking with another person also on the autism scale, trying to have a nuanced conversation where neither knows what the other is trying to say."
You're working in one branch and you want the changes from another branch (say, you've done a pull request, and want the changes made in that other branch in your current branch), but don't want to merge the changes, you just want them available.
Assuming you want them all in one go, merge without committing, with a squash, then unstage the staged files that will come over with the merge.
If you want specific changes, use
git cherrypick -n
git merge --no-commit --squash branch_with_commits git reset HEAD
Happy 15 years to Nags!
Good lord, have I changed.
Good f---ing lord, I wish I hadn't.
Good fucking lord, I'm glad I did.
I can think of a lot of mistakes I've made. I wish I hadn't made them, I hope I've learned from them. I'm sorry for the pain I've caused. I'm grateful for the joy I've caused.
Good lord, 15 years.
Here's hoping for another 15.
My reading goals for this year are/were:
1. Read 52 books
2. Of the books I read, have at least one third of them be non-fiction.
These are nominally reasonable goals. I've read over fifty-two books a year since my forty book year five years ago, and decided that was too few. Fifty two is one a week and a solid baseline.
I'm at 98 books so far for the year, not including essay books.
I am delighted that I've kept up my one-third non-fiction goal. I've read 35 non-fiction books so far. I might have to read one more non-fiction book this year to keep the ratio.
What surprised me most about my books, however is that in the fiction books, thirteen of them have black protagonists. Also, five are Asian, two books have a balanced ensemble of protagonists of varied races, and three books I don't actually know the protagonists' races.
Contrast this to last year when I had, I think, seven books of non-white protagonists. I skim counted, I could be mistaken. I also had twelve non-fiction books, of the ninety-eight I read for the year.
I need to add new categories to my book tracking, to better understand my reading trends, but I am really happy with my increased reading diversity.