From 1d962da949d883af3e82bf30df3bd010f40543fa Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 5 Nov 2020 13:05:11 +0000 Subject: 2020-11-05T13: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 c704f90a4c6e..5c3cd5927341 100644 --- a/audio-overlay.html +++ b/audio-overlay.html @@ -46,49 +46,47 @@ 18
$ pmaint sync audio-overlay
- 19
WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            22
commands sometime before your next pull:
+            22
 

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

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

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

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

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

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

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

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

-            31
invocation.
+            31
 

-            32
+            32
Already up to date.
 

-            33
Already up to date.
+            33
*** syncing audio-overlay
 

-            34
*** syncing audio-overlay
+            34
*** synced audio-overlay
 

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

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

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

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

-            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 audio-overlay
-

-            40
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad