From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:39:12 +0000 (-0700)
Subject: Merge branch 'ss/howto-manage-trunk'
X-Git-Tag: v2.1.0-rc0~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75866e60453c0c2a19f4de1bef56da34119bee3b;p=git

Merge branch 'ss/howto-manage-trunk'

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

75866e60453c0c2a19f4de1bef56da34119bee3b