diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 13:06:50 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 13:06:50 +0000 |
| commit | e33cd2177cdc87b735a38a633f638b6c1b13e406 (patch) | |
| tree | 841c1fce6f14cf728b2a4c07d154fdcce60848a5 /grub2-themes.txt | |
| parent | 2020-10-23T12:00:01Z (diff) | |
| download | repos-e33cd2177cdc87b735a38a633f638b6c1b13e406.tar.gz repos-e33cd2177cdc87b735a38a633f638b6c1b13e406.tar.bz2 repos-e33cd2177cdc87b735a38a633f638b6c1b13e406.zip | |
2020-10-23T13:00:01Z
Diffstat (limited to 'grub2-themes.txt')
| -rw-r--r-- | grub2-themes.txt | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/grub2-themes.txt b/grub2-themes.txt index 82a75f44c3e2..8cc0deefba68 100644 --- a/grub2-themes.txt +++ b/grub2-themes.txt @@ -12,23 +12,23 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/repo/proj/grub2-themes.git'}], 'status': 'official'} - * Adding new repository $ pmaint sync grub2-themes -WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', 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:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', 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:gerislay repo at '/var/lib/repo-mirror-ci/sync/gerislay', 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:gnustep repo at '/var/lib/repo-mirror-ci/sync/gnustep', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:goris repo at '/var/lib/repo-mirror-ci/sync/goris', 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/grub2-themes'... +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 grub2-themes *** synced grub2-themes * Sync succeeded |