From b1083bf99342902d34e66906ab57b83f90fddf93 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 1 May 2021 12:04:59 +0000 Subject: 2021-05-01T12:00:01Z --- beatussum-overlay.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'beatussum-overlay.html') diff --git a/beatussum-overlay.html b/beatussum-overlay.html index 39cfac19e92e..ebf38e79d3fb 100644 --- a/beatussum-overlay.html +++ b/beatussum-overlay.html @@ -62,49 +62,47 @@ 26
$ pmaint sync beatussum-overlay
- 27
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).
+            27
*** syncing beatussum-overlay
 

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

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

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

-            31
commands sometime before your next pull:
+            31
 

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

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

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

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

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

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

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

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

-            40
invocation.
+            40
 

-            41
+            41
Already up to date.
 

-            42
Already up to date.
+            42
*** synced beatussum-overlay
 

-            43
*** synced beatussum-overlay
+            43
 * Sync succeeded
 

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

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

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

-            47
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 beatussum-overlay
-

-            48
 * Cache regenerated successfully
+            47
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad