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