diff options
Diffstat (limited to 'Drauthius.txt')
| -rw-r--r-- | Drauthius.txt | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/Drauthius.txt b/Drauthius.txt index f378260b9718..865062757414 100644 --- a/Drauthius.txt +++ b/Drauthius.txt @@ -13,25 +13,14 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/repo/user/Drauthius.git'}], 'status': 'unofficial'} -$ pmaint sync Drauthius -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: +pkgcore 0.12.24 - 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. - -Already up to date. +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync Drauthius *** syncing Drauthius +Already up to date. *** synced Drauthius * Sync succeeded $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD -$ pmaint regen --use-local-desc --pkg-desc-index -t 1 Drauthius +$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 Drauthius * Cache regenerated successfully |