summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-02-20 09:37:03 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-02-20 09:37:03 +0000
commitbdc66da77de1a4bf6c19f3fb1995b93302af6f43 (patch)
tree2af56f12fa43eb2c4eb2cd8b57b8e0f8d13a576e /thegreatmcpain.txt
parent2021-02-20T09:15:01Z (diff)
downloadrepos-bdc66da77de1a4bf6c19f3fb1995b93302af6f43.tar.gz
repos-bdc66da77de1a4bf6c19f3fb1995b93302af6f43.tar.bz2
repos-bdc66da77de1a4bf6c19f3fb1995b93302af6f43.zip
2021-02-20T09:30:01Z
Diffstat (limited to 'thegreatmcpain.txt')
-rw-r--r--thegreatmcpain.txt18
1 files changed, 14 insertions, 4 deletions
diff --git a/thegreatmcpain.txt b/thegreatmcpain.txt
index 20a7f24fced9..446758f5d451 100644
--- a/thegreatmcpain.txt
+++ b/thegreatmcpain.txt
@@ -11,11 +11,21 @@
{'type': 'git',
'uri': 'git@gitlab.com:TheGreatMcPain/thegreatmcpain-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync thegreatmcpain
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:src_prepare-overlay repo at '/var/lib/repo-mirror-ci/sync/src_prepare-overlay', 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/thegreatmcpain'...
+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 thegreatmcpain
*** synced thegreatmcpain
* Sync succeeded