At the start of this year I set myself four goals:
Read 12 Books
I read 20 books! This is twice as many as 2018
Make a 5% return on savings and investments
I made a 5.2% average return (unweighted, includes investments held for less than 6 months) on my investments. Savings accounts much less as repeated rate cuts hurt my savings growth.
Travel to USA or Singapore/Asia
I went to Japan!
Buy a Mazda 3
I paid for my own wedding instead!
Like most years, what was expected at the start of the year and what transpired was very different. That said, 2019, despite a number of stressors, was a great year. Bring on the next decade and new adventures in marital bliss!
Recently I found myself in a situation where I wanted to bring in a specific upstream commit into a forked repository. Although these repos share a common history, the two repos had diverged enough that it wasn’t a straight-forward cherry-pick between branches. Instead, with clones of the two repositories I managed to cherry-pick as follows:
To complicate things further, a few days later, I found myself wanting to do the same thing, however, this time a submodule and another file had diverged enough that the patch no longer applied correctly. To get around this I had to:
Finally, I’ve also in recent months found myself wanting to create a completely empty commit to kick off a downstream build process… much like you may touch a file to change its timestamp. To do this you can simply run: