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 --- quarks.html | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) (limited to 'quarks.html') diff --git a/quarks.html b/quarks.html index c33b19f260ff..9007c0875515 100644 --- a/quarks.html +++ b/quarks.html @@ -34,57 +34,47 @@ 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: Pulling without specifying how to reconcile divergent branches is
 

-            14
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
discouraged. You can squelch this message by running one of the following
 

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

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

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

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
  git config pull.rebase true   # rebase
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
  git config pull.ff only       # fast-forward only
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
  git config pull.rebase true   # rebase
+            23
or --ff-only on the command line to override the configured default per
 

-            24
  git config pull.ff only       # fast-forward only
+            24
invocation.
 

             25
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
Already up to date.
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
*** syncing quarks
 

-            28
or --ff-only on the command line to override the configured default per
+            28
*** synced quarks
 

-            29
invocation.
+            29
 * Sync succeeded
 

-            30
+            30
$ git log --format=%ci -1
 

-            31
Already up to date.
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
*** syncing quarks
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 quarks
 

-            33
*** synced quarks
-

-            34
 * Sync succeeded
-

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

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

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 quarks
-

-            38
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad