Merge branch 'ss/howto-manage-trunk'

* ss/howto-manage-trunk: How to keep a project's canonical history correct.

Junio C Hamano committed Jun 6, 2014 at 11:39 UTC 75866e60453c0c2a19f4de1bef56da34119bee3b

No changes.