@b0rk Very nice. Git is a complex world for something that wants to manage source code changes, that's for sure.

I noticed what might be a minor error in the fast-forward discussion. You mention "doesn't have X and Y" but there's no "Y" in the aforementioned state.