diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 13:36:13 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 13:36:13 +0000 |
| commit | 999dec99e30a92fa453f6273302d4ffec271f435 (patch) | |
| tree | a72c38eaa736e8a939ffabed3a99e4019c0370b7 /mozilla.txt | |
| parent | 2020-10-23T13:00:01Z (diff) | |
| download | repos-999dec99e30a92fa453f6273302d4ffec271f435.tar.gz repos-999dec99e30a92fa453f6273302d4ffec271f435.tar.bz2 repos-999dec99e30a92fa453f6273302d4ffec271f435.zip | |
2020-10-23T13:30:01Z
Diffstat (limited to 'mozilla.txt')
| -rw-r--r-- | mozilla.txt | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mozilla.txt b/mozilla.txt index c134602d9555..3cce14dd114e 100644 --- a/mozilla.txt +++ b/mozilla.txt @@ -10,21 +10,21 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/proj/mozilla.git'}], 'status': 'official'} - * Adding new repository $ pmaint sync mozilla -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:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', 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:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', 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:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', 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:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', 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/mozilla'... +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 mozilla *** synced mozilla * Sync succeeded |