summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'milos-rs.txt')
-rw-r--r--milos-rs.txt17
1 files changed, 15 insertions, 2 deletions
diff --git a/milos-rs.txt b/milos-rs.txt
index 831c9abc9b5e..d6f82944e692 100644
--- a/milos-rs.txt
+++ b/milos-rs.txt
@@ -9,9 +9,22 @@
'source': [{'type': 'git',
'uri': 'https://github.com/milos-rs/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync milos-rs
-Cloning into '/var/lib/repo-mirror-ci/sync/milos-rs'...
+WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+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 milos-rs
*** synced milos-rs
* Sync succeeded