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 --- steam-overlay.html | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) (limited to 'steam-overlay.html') diff --git a/steam-overlay.html b/steam-overlay.html index dedbf760f546..db60b16382b4 100644 --- a/steam-overlay.html +++ b/steam-overlay.html @@ -38,57 +38,47 @@ 14
$ pmaint sync steam-overlay
- 15
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).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            17
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
commands sometime before your next pull:
 

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

-            19
WARNING:pkgcore:seden repo at '/var/lib/repo-mirror-ci/sync/seden', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
  git config pull.rebase false  # merge (the default strategy)
 

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

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

-            22
commands sometime before your next pull:
+            22
 

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

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

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

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

             27
 

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

-            29
preference for all repositories. You can also pass --rebase, --no-rebase,
+            29
*** syncing steam-overlay
 

-            30
or --ff-only on the command line to override the configured default per
+            30
*** synced steam-overlay
 

-            31
invocation.
+            31
 * Sync succeeded
 

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

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

-            34
*** syncing steam-overlay
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 steam-overlay
 

-            35
*** synced steam-overlay
-

-            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 steam-overlay
-

-            40
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad