From 999dec99e30a92fa453f6273302d4ffec271f435 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 13:36:13 +0000 Subject: 2020-10-23T13:30:01Z --- sabayon.html | 58 ++++++++++++++++++++-------------------------------------- 1 file changed, 20 insertions(+), 38 deletions(-) (limited to 'sabayon.html') diff --git a/sabayon.html b/sabayon.html index 3b7310915218..fed7952f34ff 100644 --- a/sabayon.html +++ b/sabayon.html @@ -40,65 +40,47 @@ 15
$ pmaint sync sabayon
- 16
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).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            18
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', 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:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:mozilla repo at '/var/lib/repo-mirror-ci/sync/mozilla', 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:musl repo at '/var/lib/repo-mirror-ci/sync/musl', 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:pigfoot repo at '/var/lib/repo-mirror-ci/sync/pigfoot', 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:qt repo at '/var/lib/repo-mirror-ci/sync/qt', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            23
 

-            24
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', 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: Pulling without specifying how to reconcile divergent branches is
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
discouraged. You can squelch this message by running one of the following
+            26
or --ff-only on the command line to override the configured default per
 

-            27
commands sometime before your next pull:
+            27
invocation.
 

             28
 

-            29
  git config pull.rebase false  # merge (the default strategy)
+            29
Already up to date.
 

-            30
  git config pull.rebase true   # rebase
+            30
*** syncing sabayon
 

-            31
  git config pull.ff only       # fast-forward only
+            31
*** synced sabayon
 

-            32
+            32
 * Sync succeeded
 

-            33
You can replace "git config" with "git config --global" to set a default
+            33
$ git log --format=%ci -1
 

-            34
preference for all repositories. You can also pass --rebase, --no-rebase,
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
or --ff-only on the command line to override the configured default per
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sabayon
 

-            36
invocation.
-

-            37
-

-            38
Already up to date.
-

-            39
*** syncing sabayon
-

-            40
*** synced sabayon
-

-            41
 * Sync succeeded
-

-            42
$ git log --format=%ci -1
-

-            43
$ git show -q --pretty=format:%G? HEAD
-

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sabayon
-

-            45
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad