Hey great work beej! I've read pro git and your guide is very good.
So in figure 5.4 you say we merge 2 commits into a new one and somehow both branches point to new commit. This will definitely confuse people new to git.
I'd say it's better to write we merge anotherBranch into someBranch and leave the former where it is. Same for the next merge.
Yeah, I was speaking a little fast and loose here since this was just the intro part. I was worried that it would actually be more confusing to say that we merged them and they pointed to different places... which is of course what actually happens.
> I believe the user is referring to the iPhone here.
The author of the book in a 2016 interview:
> Q. As you note in your book, many of the inventions in the special century took as long as five decades to reach their full potential. Since the iPhone was introduced in 2007, isn't it too early to say that smartphones aren't transformative?
> A. I think the potential of smartphones has played out very rapidly. We're still at the dawn of payment systems based on the smartphone. We may 10 years from now look back and marvel at the fact that people had to pull credit cards out of their wallet.
> But remember, the entire decade of the rollout of the smartphone and all the applications have not caused productivity growth to budge. There are many people who think we're missing the benefits of the smartphone in our measures of productivity and GDP. But we've always missed the benefits of new inventions.
Economic growth has always been understated. But the degree of understatement was more important in the past, because the innovations were more transformative to every aspect of human life.
> […] In the last 15 years, we’ve had the invention of smartphones and social networks, and what they’ve done is bring enormous amounts of consumer surplus to everyday people of the world. This is not really counted in productivity, it hasn’t changed the way businesses conduct their day-to-day affairs all that much, but what they have done is change the lives of citizens in a way that is not counted in GDP or productivity. It’s possible the amount of consumer welfare we’re getting relative to GDP may be growing at an unprecedented rate.
It's very nice to have maps and the world's knowledge in your pocket, but how much has it cause the economy to growth? Has it reduced rates of poverty? If it has, it's not showing up in the numbers, so how can we tell?
(The technology may be having more of an impact in other countries, especially those starting at a lower 'base', but there isn't a measurable economic impact in the US.)
In Istanbul, uniquely for a Muslim country, stray dogs are tolerated and are “regulated” by the city government. One day I saw a huge pack stampeding down the road en mass. Turks seemingly have a penchant for owning giant dogs, too.
I thought this was universal (in Greece) until I moved in the city center of Athens. I now only see stray dogs as an exception, e.g. in tourist-heavy, central places. I genuinely have no idea if it's the state's responsibility.
That's an interesting triple entendre sentence build around "smelt", which is a past tense (archaic maybe?) of smell, often written smelled, and a smelt is a little silver fish, so quite stinky, and smelt is liquid metal.
That's a rare sentence that pretty much works all three ways.
Myself, I had already switched to Colemak when I developed RSI due to heavy typing at my work. What did it for me was the unnatural position of my hands, wrists bent upwards and outwards in order to fit onto the "tiny" laptop keyboard.
The solution was simply to switch to a run-of-the-mill ergonomic keyboard (ERGO K860) and surprise, surprise, my RSI lessened and eventually disappeared in 2 weeks or so.
So, for me it was definitely the hand posture, NOT the layout that caused the problems!
In 9.4 there's no way reallinux/master points to same commit as master after the merge. It will still be where it was, one commit behind.