summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-03-03 02:41:00 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-03-03 02:41:00 +0000
commit104fdf082712cb35f54b6932f6fe428ca7bb6ea5 (patch)
treec5b9361a2f9eb59803eca1f678681fcae3690d96 /dm9pZCAq.txt
parent2021-03-03T02:15:01Z (diff)
downloadrepos-104fdf082712cb35f54b6932f6fe428ca7bb6ea5.tar.gz
repos-104fdf082712cb35f54b6932f6fe428ca7bb6ea5.tar.bz2
repos-104fdf082712cb35f54b6932f6fe428ca7bb6ea5.zip
2021-03-03T02:30:01Z
Diffstat (limited to 'dm9pZCAq.txt')
-rw-r--r--dm9pZCAq.txt17
1 files changed, 14 insertions, 3 deletions
diff --git a/dm9pZCAq.txt b/dm9pZCAq.txt
index 68f452b0837c..811950b4f272 100644
--- a/dm9pZCAq.txt
+++ b/dm9pZCAq.txt
@@ -7,10 +7,21 @@
'source': [{'type': 'git',
'uri': 'https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync dm9pZCAq
-WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', 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/dm9pZCAq'...
+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 dm9pZCAq
*** synced dm9pZCAq
* Sync succeeded