diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-09-02 03:07:02 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-09-02 03:07:02 +0000 |
| commit | 71b1b7a85d63dda48c1ef79867efedf0d98e135c (patch) | |
| tree | bae8ee9847762ab9dffef323083b7b929eddfa29 /slonko.txt | |
| parent | 2020-09-02T02:30:01Z (diff) | |
| download | repos-71b1b7a85d63dda48c1ef79867efedf0d98e135c.tar.gz repos-71b1b7a85d63dda48c1ef79867efedf0d98e135c.tar.bz2 repos-71b1b7a85d63dda48c1ef79867efedf0d98e135c.zip | |
2020-09-02T03:00:01Z
Diffstat (limited to 'slonko.txt')
| -rw-r--r-- | slonko.txt | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/slonko.txt b/slonko.txt index c54cc6eda9fb..03309519f0bb 100644 --- a/slonko.txt +++ b/slonko.txt @@ -8,11 +8,22 @@ 'quality': 'experimental', 'source': [{'type': 'git', 'uri': 'https://slonko.net/git/portage'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync slonko WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -Cloning into '/var/lib/repo-mirror-ci/sync/slonko'... +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. + +Already up to date. *** syncing slonko *** synced slonko * Sync succeeded |