From aa2ab831a54c6ecfc4d2ce7ac8acc9df292d8fc5 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 30 Sep 2020 07:35:06 +0000 Subject: 2020-09-30T07:30:01Z --- menelkir.html | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'menelkir.html') diff --git a/menelkir.html b/menelkir.html index c00602744bda..f048ab83158a 100644 --- a/menelkir.html +++ b/menelkir.html @@ -38,51 +38,47 @@ 14
$ pmaint sync menelkir
- 15
WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
discouraged. You can squelch this message by running one of the following
 

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

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

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

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

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

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

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

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

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

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

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

-            28
invocation.
+            28
Already up to date.
 

-            29
+            29
*** syncing menelkir
 

-            30
Already up to date.
+            30
*** synced menelkir
 

-            31
*** syncing menelkir
+            31
 * Sync succeeded
 

-            32
*** synced menelkir
+            32
$ git log --format=%ci -1
 

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

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

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

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 menelkir
-

-            37
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad