From 6e28d2f47b77504664700a9962c5f684a3316a92 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 22 Sep 2020 05:35:29 +0000 Subject: 2020-09-22T05:30:01Z --- cj-overlay.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'cj-overlay.html') diff --git a/cj-overlay.html b/cj-overlay.html index 51396f0eb1e4..f0d3ad34948e 100644 --- a/cj-overlay.html +++ b/cj-overlay.html @@ -28,47 +28,49 @@ 9
$ pmaint sync cj-overlay
- 10
warning: Pulling without specifying how to reconcile divergent branches is
+            10
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).
 

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

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

-            13
+            13
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            22
+            22
invocation.
 

-            23
Already up to date.
+            23
 

-            24
*** syncing cj-overlay
+            24
Already up to date.
 

-            25
*** synced cj-overlay
+            25
*** syncing cj-overlay
 

-            26
 * Sync succeeded
+            26
*** synced cj-overlay
 

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

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

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

-            30
 * Cache regenerated successfully
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 cj-overlay
+

+            31
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad