From e52cb7b016d5b36e8938657f6c9484cfbc8dc418 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 18:05:16 +0000 Subject: 2020-10-23T18:00:01Z --- ikelos.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'ikelos.html') diff --git a/ikelos.html b/ikelos.html index 450923ba68e6..d9195dd1ea35 100644 --- a/ikelos.html +++ b/ikelos.html @@ -38,35 +38,35 @@ 14
 'status': 'unofficial'}
- 15
 * Adding new repository
+            15
$ pmaint sync ikelos
 

-            16
$ pmaint sync ikelos
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
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).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
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).
+            18
commands sometime before your next pull:
 

-            19
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).
+            19
 

-            20
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).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
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).
+            21
  git config pull.rebase true   # rebase
 

-            22
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            22
  git config pull.ff only       # fast-forward only
 

-            23
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).
+            23
 

-            24
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).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
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).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
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).
+            26
or --ff-only on the command line to override the configured default per
 

-            27
WARNING:pkgcore:graaff repo at '/var/lib/repo-mirror-ci/sync/graaff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            27
invocation.
 

-            28
WARNING:pkgcore:hibiscus repo at '/var/lib/repo-mirror-ci/sync/hibiscus', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            28
 

-            29
Cloning into '/var/lib/repo-mirror-ci/sync/ikelos'...
+            29
Already up to date.
 

             30
*** syncing ikelos
 

-- 
cgit v1.2.3-65-gdbad