From 58f911d8b813d5d470d2c9fe00d27da864db0349 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 23 Nov 2020 12:35:16 +0000 Subject: 2020-11-23T12:30:01Z --- klondike.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'klondike.html') diff --git a/klondike.html b/klondike.html index 0cbdcc7f274e..fec8faf5626f 100644 --- a/klondike.html +++ b/klondike.html @@ -46,47 +46,49 @@ 18
WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
- 19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            22
+            22
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            31
+            31
invocation.
 

-            32
Already up to date.
+            32
 

-            33
*** syncing klondike
+            33
Already up to date.
 

-            34
*** synced klondike
+            34
*** syncing klondike
 

-            35
 * Sync succeeded
+            35
*** synced klondike
 

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

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

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 klondike
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            39
 * Cache regenerated successfully
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 klondike
+

+            40
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad