From d78bb4b403f0b060b48763b8634f25f123258984 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 12 Apr 2021 03:04:53 +0000 Subject: 2021-04-12T03:00:01Z --- megacoffee.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'megacoffee.html') diff --git a/megacoffee.html b/megacoffee.html index 3965fef39bbf..1ac2d738fb23 100644 --- a/megacoffee.html +++ b/megacoffee.html @@ -58,49 +58,47 @@ 24
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).
- 25
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).
+            25
*** syncing megacoffee
 

-            26
*** syncing megacoffee
+            26
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            29
commands sometime before your next pull:
+            29
 

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

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

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

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

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

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

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

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

-            38
invocation.
+            38
 

-            39
+            39
Already up to date.
 

-            40
Already up to date.
+            40
*** synced megacoffee
 

-            41
*** synced megacoffee
+            41
 * Sync succeeded
 

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

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

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

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 megacoffee
-

-            46
 * Cache regenerated successfully
+            45
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad