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 --- audio-overlay.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'audio-overlay.html') diff --git a/audio-overlay.html b/audio-overlay.html index adb2ba03c9a9..55759ad1a279 100644 --- a/audio-overlay.html +++ b/audio-overlay.html @@ -50,49 +50,47 @@ 20
$ pmaint sync audio-overlay
- 21
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).
+            21
*** syncing audio-overlay
 

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

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

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

-            25
commands sometime before your next pull:
+            25
 

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

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

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

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

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

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

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

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

-            34
invocation.
+            34
 

-            35
+            35
Already up to date.
 

-            36
Already up to date.
+            36
*** synced audio-overlay
 

-            37
*** synced audio-overlay
+            37
 * Sync succeeded
 

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

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

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

-            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 audio-overlay
-

-            42
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad