From 2ffb41e08c4966ad8814f3cea74105e78364fe0b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 20 Nov 2020 12:35:51 +0000 Subject: 2020-11-20T12:30:01Z --- gamerlay.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'gamerlay.html') diff --git a/gamerlay.html b/gamerlay.html index 3a6f8ff75dc5..d34e518d9f21 100644 --- a/gamerlay.html +++ b/gamerlay.html @@ -48,47 +48,49 @@ 19
$ pmaint sync gamerlay
- 20
warning: Pulling without specifying how to reconcile divergent branches is
+            20
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
discouraged. You can squelch this message by running one of the following
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            23
+            23
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            32
+            32
invocation.
 

-            33
Already up to date.
+            33
 

-            34
*** syncing gamerlay
+            34
Already up to date.
 

-            35
*** synced gamerlay
+            35
*** syncing gamerlay
 

-            36
 * Sync succeeded
+            36
*** synced gamerlay
 

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

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

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

-            40
 * Cache regenerated successfully
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gamerlay
+

+            41
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad