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 --- quarks.html | 56 ++++++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 34 deletions(-) (limited to 'quarks.html') diff --git a/quarks.html b/quarks.html index ce5239b4356a..044cc1bf5c3e 100644 --- a/quarks.html +++ b/quarks.html @@ -34,61 +34,49 @@ 12
$ pmaint sync quarks
 
- 13
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).
+            13
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).
 
- 14
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).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 
- 15
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).
+            15
discouraged. You can squelch this message by running one of the following
 
- 16
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).
+            16
commands sometime before your next pull:
 
- 17
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).
+            17
 
- 18
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).
+            18
  git config pull.rebase false  # merge (the default strategy)
 
- 19
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).
+            19
  git config pull.rebase true   # rebase
 
- 20
warning: Pulling without specifying how to reconcile divergent branches is
+            20
  git config pull.ff only       # fast-forward only
 
- 21
discouraged. You can squelch this message by running one of the following
+            21
 
- 22
commands sometime before your next pull:
+            22
You can replace "git config" with "git config --global" to set a default
 
- 23
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 24
  git config pull.rebase false  # merge (the default strategy)
+            24
or --ff-only on the command line to override the configured default per
 
- 25
  git config pull.rebase true   # rebase
+            25
invocation.
 
- 26
  git config pull.ff only       # fast-forward only
+            26
 
- 27
+            27
Already up to date.
 
- 28
You can replace "git config" with "git config --global" to set a default
+            28
*** syncing quarks
 
- 29
preference for all repositories. You can also pass --rebase, --no-rebase,
+            29
*** synced quarks
 
- 30
or --ff-only on the command line to override the configured default per
+            30
 * Sync succeeded
 
- 31
invocation.
+            31
$ git log --format=%ci -1
 
- 32
+            32
$ git show -q --pretty=format:%G? HEAD
 
- 33
Already up to date.
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 quarks
 
- 34
*** syncing quarks
-
- 35
*** synced quarks
-
- 36
 * Sync succeeded
-
- 37
$ git log --format=%ci -1
-
- 38
$ git show -q --pretty=format:%G? HEAD
-
- 39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 quarks
-
- 40
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 
-- cgit v1.2.3-65-gdbad