From a26d55e95347e3e2f37ff0f3b09df51913405ead Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 4 Oct 2020 10:35:09 +0000 Subject: 2020-10-04T10:30:01Z --- fol4.html | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'fol4.html') diff --git a/fol4.html b/fol4.html index 2e09c7968d42..54eddb7bbf45 100644 --- a/fol4.html +++ b/fol4.html @@ -30,49 +30,51 @@ 10
$ pmaint sync fol4
- 11
warning: Pulling without specifying how to reconcile divergent branches is
+            11
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).
 

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

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

-            14
+            14
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            23
+            23
invocation.
 

-            24
warning: redirecting to https://gitlab.com/madsl/fol4.git/
+            24
 

-            25
Already up to date.
+            25
warning: redirecting to https://gitlab.com/madsl/fol4.git/
 

-            26
*** syncing fol4
+            26
Already up to date.
 

-            27
*** synced fol4
+            27
*** syncing fol4
 

-            28
 * Sync succeeded
+            28
*** synced fol4
 

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

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

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

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

+            33
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad