From 89457c7a249753c66609d2a09158f42e66042d46 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 22 Mar 2021 02:35:40 +0000 Subject: 2021-03-22T02:30:01Z --- sk-overlay.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'sk-overlay.html') diff --git a/sk-overlay.html b/sk-overlay.html index 1373ba7b9078..d1c58b8988c3 100644 --- a/sk-overlay.html +++ b/sk-overlay.html @@ -40,49 +40,47 @@ 15
$ pmaint sync sk-overlay
- 16
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).
+            16
*** syncing sk-overlay
 

-            17
*** syncing sk-overlay
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
commands sometime before your next pull:
 

-            20
commands sometime before your next pull:
+            20
 

-            21
+            21
  git config pull.rebase false  # merge (the default strategy)
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
  git config pull.rebase true   # rebase
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.ff only       # fast-forward only
 

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

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

-            26
You can replace "git config" with "git config --global" to set a default
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
or --ff-only on the command line to override the configured default per
 

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

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

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

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

-            33
 * Sync succeeded
+            33
$ git log --format=%ci -1
 

-            34
$ git log --format=%ci -1
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sk-overlay
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 sk-overlay
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad