diff options
Diffstat (limited to 'bleeding-edge.txt')
| -rw-r--r-- | bleeding-edge.txt | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/bleeding-edge.txt b/bleeding-edge.txt index de16326c7fcb..ccc4884b038b 100644 --- a/bleeding-edge.txt +++ b/bleeding-edge.txt @@ -14,15 +14,21 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/repo/user/bleeding-edge.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync bleeding-edge -WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:alexxy repo at '/var/lib/repo-mirror-ci/sync/alexxy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:anaximander repo at '/var/lib/repo-mirror-ci/sync/anaximander', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:andy repo at '/var/lib/repo-mirror-ci/sync/andy', 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/bleeding-edge'... +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 bleeding-edge *** synced bleeding-edge * Sync succeeded |