From 21a27b78e552f1dc249b8d5055bb65bb3a4c4b05 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 8 Sep 2020 02:35:08 +0000 Subject: 2020-09-08T02:30: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 c1ca1420e869..1d3dac4b261e 100644 --- a/beatussum-overlay.html +++ b/beatussum-overlay.html @@ -58,49 +58,47 @@ 24
$ pmaint sync beatussum-overlay
- 25
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).
+            25
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            28
commands sometime before your next pull:
+            28
 

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

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

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

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

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

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

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

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

-            37
invocation.
+            37
 

-            38
+            38
Already up to date.
 

-            39
Already up to date.
+            39
*** syncing beatussum-overlay
 

-            40
*** syncing beatussum-overlay
+            40
*** synced beatussum-overlay
 

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

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

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

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

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 beatussum-overlay
-

-            46
 * Cache regenerated successfully
+            45
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad