From: W. Trevor King Date: Wed, 1 Oct 2014 11:50:48 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/dev-python/preggy' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1bc6f0813a3b09eb398288776c17aa1fdd8687a4;p=wtk-overlay.git Merge remote-tracking branch 'origin/dev-python/preggy' Pull in this per-package branch with a subtree merge [1]: $ git merge -s ours --no-commit origin/dev-python/preggy $ git read-tree --prefix=dev-python/preggy/ -u origin/dev-python/preggy $ git commit -av so folks who aren't using a version of Layman that supports submodules (currently everybody) can use this modular package. [1]: https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html --- 1bc6f0813a3b09eb398288776c17aa1fdd8687a4 diff --cc dev-python/preggy/preggy-9999.ebuild index 0000000,61ca11e..61ca11e mode 000000,100644..100644 --- a/dev-python/preggy/preggy-9999.ebuild +++ b/dev-python/preggy/preggy-9999.ebuild