From cb6f7686a52cc46b099da38d7d7f10b68e9d7e94 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 27 Aug 2020 19:35:08 +0000 Subject: 2020-08-27T19:30:01Z --- trolltoo.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'trolltoo.html') diff --git a/trolltoo.html b/trolltoo.html index 454cb3aeaf63..4aaa8d9301ca 100644 --- a/trolltoo.html +++ b/trolltoo.html @@ -38,47 +38,49 @@ 14
$ pmaint sync trolltoo
- 15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', 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
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            18
+            18
commands sometime before your next pull:
 

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

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

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

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

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

-            24
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
 

-            25
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,
 

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

-            27
+            27
invocation.
 

-            28
Already up to date.
+            28
 

-            29
*** syncing trolltoo
+            29
Already up to date.
 

-            30
*** synced trolltoo
+            30
*** syncing trolltoo
 

-            31
 * Sync succeeded
+            31
*** synced trolltoo
 

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

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

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

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

+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad