projects
/
wtk-overlay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
abed02d
a211855
)
Merge remote-tracking branch 'origin/dev-python/preggy'
author
W. Trevor King
<wking@tremily.us>
Wed, 1 Oct 2014 11:50:48 +0000
(
04:50
-0700)
committer
W. Trevor King
<wking@tremily.us>
Wed, 1 Oct 2014 11:50:48 +0000
(
04:50
-0700)
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
1
2
dev-python/preggy/preggy-9999.ebuild
patch
|
|
diff2
|
blob
|
history
diff --cc
dev-python/preggy/preggy-9999.ebuild
index 0000000000000000000000000000000000000000,61ca11edd559fe891c1ffd3f4581f0750cf8b0e1..61ca11edd559fe891c1ffd3f4581f0750cf8b0e1
mode 000000,100644..100644
--- /dev/null
---
2
/
preggy-9999.ebuild
+++ b/
dev-python/preggy/preggy-9999.ebuild