diff options
Diffstat (limited to 'tgbugs-overlay.txt')
| -rw-r--r-- | tgbugs-overlay.txt | 53 |
1 files changed, 52 insertions, 1 deletions
diff --git a/tgbugs-overlay.txt b/tgbugs-overlay.txt index 2990cf1048be..49f94d8e734d 100644 --- a/tgbugs-overlay.txt +++ b/tgbugs-overlay.txt @@ -13,7 +13,58 @@ {'type': 'git', 'uri': 'git@github.com:tgbugs/tgbugs-overlay.git'}], 'status': 'unofficial'} $ pmaint sync tgbugs-overlay -Already up to date. +warning: Pulling without specifying how to reconcile divergent branches is +discouraged. You can squelch this message by running one of the following +commands sometime before your next pull: + + git config pull.rebase false # merge (the default strategy) + git config pull.rebase true # rebase + git config pull.ff only # fast-forward only + +You can replace "git config" with "git config --global" to set a default +preference for all repositories. You can also pass --rebase, --no-rebase, +or --ff-only on the command line to override the configured default per +invocation. + +From https://github.com/tgbugs/tgbugs-overlay + 6e0b8d8..facc6a4 master -> origin/master +Updating 6e0b8d8..facc6a4 +Fast-forward + dev-python/augpathlib/Manifest | 36 ++----------- + dev-python/augpathlib/augpathlib-0.0.1.ebuild | 34 ------------- + dev-python/augpathlib/augpathlib-0.0.10.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.11.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.12.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.15.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.16.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.18.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.2.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.20.ebuild | 58 --------------------- + ...hlib-0.0.19.ebuild => augpathlib-0.0.21.ebuild} | 2 + + dev-python/augpathlib/augpathlib-0.0.3-r1.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.4-r1.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.5.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.7.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.8.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-0.0.9.ebuild | 59 ---------------------- + dev-python/augpathlib/augpathlib-9999.ebuild | 2 + + 18 files changed, 7 insertions(+), 892 deletions(-) + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.1.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.10.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.11.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.12.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.15.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.16.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.18.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.2.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.20.ebuild + rename dev-python/augpathlib/{augpathlib-0.0.19.ebuild => augpathlib-0.0.21.ebuild} (92%) + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.3-r1.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.4-r1.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.5.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.7.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.8.ebuild + delete mode 100644 dev-python/augpathlib/augpathlib-0.0.9.ebuild *** syncing tgbugs-overlay *** synced tgbugs-overlay * Sync succeeded |