From 62101ecbc215e66c5c92b808745e3b0b1a7a765d Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 26 Apr 2021 11:49:52 +0000 Subject: 2021-04-26T11:45:01Z --- libressl.html | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'libressl.html') diff --git a/libressl.html b/libressl.html index 601a28342c2f..df1f99068899 100644 --- a/libressl.html +++ b/libressl.html @@ -34,51 +34,47 @@ 12
$ pmaint sync libressl
- 13
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).
+            13
*** syncing libressl
 

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

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

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

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

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

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

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

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

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

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

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

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

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

-            27
invocation.
+            27
Already up to date.
 

-            28
+            28
*** synced libressl
 

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

-            30
*** synced libressl
+            30
$ git log --format=%ci -1
 

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

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

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

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 libressl
-

-            35
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad