summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-04-12 00:34:56 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-04-12 00:34:56 +0000
commitae5e4ac95c6d1ef2f140e565271e6ca3f361e716 (patch)
treec10ed401e55cba735a54d8f050da2cabe7b6f06d /dm9pZCAq.txt
parent2021-04-12T00:15:01Z (diff)
downloadrepos-ae5e4ac95c6d1ef2f140e565271e6ca3f361e716.tar.gz
repos-ae5e4ac95c6d1ef2f140e565271e6ca3f361e716.tar.bz2
repos-ae5e4ac95c6d1ef2f140e565271e6ca3f361e716.zip
2021-04-12T00: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 bba0e4c88baf..0a452fdf9bcf 100644
--- a/dm9pZCAq.txt
+++ b/dm9pZCAq.txt
@@ -7,12 +7,23 @@
'source': [{'type': 'git',
'uri': 'https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync dm9pZCAq
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
*** syncing dm9pZCAq
-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.
*** synced dm9pZCAq
* Sync succeeded
$ git log --format=%ci -1