]> granicus.if.org Git - git/commitdiff
Merge branch 'ss/howto-manage-trunk'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:39:12 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:39:12 +0000 (11:39 -0700)
* ss/howto-manage-trunk:
  How to keep a project's canonical history correct.


Trivial merge