From 47ce9b1be091e713d6dec9e8349c87e74289c0d8 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 29 Mar 2021 06:05:35 +0000 Subject: 2021-03-29T06:00:01Z --- salfter.html | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'salfter.html') diff --git a/salfter.html b/salfter.html index 1fcec1b4180e..b977714714fa 100644 --- a/salfter.html +++ b/salfter.html @@ -30,51 +30,47 @@ 10
$ pmaint sync salfter
- 11
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
*** syncing salfter
 

-            12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

-            13
*** syncing salfter
+            13
discouraged. You can squelch this message by running one of the following
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
commands sometime before your next pull:
 

-            15
discouraged. You can squelch this message by running one of the following
+            15
 

-            16
commands sometime before your next pull:
+            16
  git config pull.rebase false  # merge (the default strategy)
 

-            17
+            17
  git config pull.rebase true   # rebase
 

-            18
  git config pull.rebase false  # merge (the default strategy)
+            18
  git config pull.ff only       # fast-forward only
 

-            19
  git config pull.rebase true   # rebase
+            19
 

-            20
  git config pull.ff only       # fast-forward only
+            20
You can replace "git config" with "git config --global" to set a default
 

-            21
+            21
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            22
You can replace "git config" with "git config --global" to set a default
+            22
or --ff-only on the command line to override the configured default per
 

-            23
preference for all repositories. You can also pass --rebase, --no-rebase,
+            23
invocation.
 

-            24
or --ff-only on the command line to override the configured default per
+            24
 

-            25
invocation.
+            25
Already up to date.
 

-            26
+            26
*** synced salfter
 

-            27
Already up to date.
+            27
 * Sync succeeded
 

-            28
*** synced salfter
+            28
$ git log --format=%ci -1
 

-            29
 * Sync succeeded
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
$ git log --format=%ci -1
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 salfter
 

-            31
$ git show -q --pretty=format:%G? HEAD
-

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 salfter
-

-            33
 * Cache regenerated successfully
+            31
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad