From a7d18cb0d62b6aeef9fa6a9587e566b10008e9e6 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 2 Jan 2021 03:05:00 +0000 Subject: 2021-01-02T03:00:01Z --- sk-overlay.html | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'sk-overlay.html') diff --git a/sk-overlay.html b/sk-overlay.html index 1df8040dcd94..7e7ed537149d 100644 --- a/sk-overlay.html +++ b/sk-overlay.html @@ -40,51 +40,47 @@ 15
$ pmaint sync sk-overlay
- 16
WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', 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:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', 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: Pulling without specifying how to reconcile divergent branches is
+            18
commands sometime before your next pull:
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
 

-            20
commands sometime before your next pull:
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
+            21
  git config pull.rebase true   # rebase
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.ff only       # fast-forward only
 

-            23
  git config pull.rebase true   # rebase
+            23
 

-            24
  git config pull.ff only       # fast-forward only
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
or --ff-only on the command line to override the configured default per
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
invocation.
 

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

-            29
invocation.
+            29
Already up to date.
 

-            30
+            30
*** syncing sk-overlay
 

-            31
Already up to date.
+            31
*** synced sk-overlay
 

-            32
*** syncing sk-overlay
+            32
 * Sync succeeded
 

-            33
*** synced sk-overlay
+            33
$ git log --format=%ci -1
 

-            34
 * Sync succeeded
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git log --format=%ci -1
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sk-overlay
 

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

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

-            38
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad