diff options
Diffstat (limited to 'squeezebox.txt')
| -rw-r--r-- | squeezebox.txt | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/squeezebox.txt b/squeezebox.txt index 1fa37c42add0..a1093616c3a6 100644 --- a/squeezebox.txt +++ b/squeezebox.txt @@ -14,19 +14,21 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/user/squeezebox.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync squeezebox -WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:science repo at '/var/lib/repo-mirror-ci/sync/science', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', 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/squeezebox'... +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 squeezebox *** synced squeezebox * Sync succeeded |