Merge branch 'ss/howto-manage-trunk'
commit75866e60453c0c2a19f4de1bef56da34119bee3b
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:39:12 +0000 (6 11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:39:12 +0000 (6 11:39 -0700)
treed2f3b24d15910de7c8584f3df306e1c08544d7b1
parenteb5398a89122e4345b1fd3cab4f5630290bb3d0e
parent0678b649a19586daa5ec45344376187b91dd7328
Merge branch 'ss/howto-manage-trunk'

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