From 5aa3ebb3b009735e1671e3853ab4843f4c221a05 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 21 Apr 2021 07:04:55 +0000 Subject: 2021-04-21T07:00:01Z --- dmchurch.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'dmchurch.html') diff --git a/dmchurch.html b/dmchurch.html index e56c77e9ed23..8f6da6af67b5 100644 --- a/dmchurch.html +++ b/dmchurch.html @@ -42,49 +42,47 @@ 16
$ pmaint sync dmchurch
- 17
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).
+            17
*** syncing dmchurch
 

-            18
*** syncing dmchurch
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            21
commands sometime before your next pull:
+            21
 

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

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

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

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

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

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

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

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

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** synced dmchurch
 

-            33
*** synced dmchurch
+            33
 * Sync succeeded
 

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

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

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

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 dmchurch
-

-            38
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-18-g5258