From 47366f328ec77c9299c7db1045e16324e9dc7911 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 9 Nov 2020 17:40:22 +0000 Subject: 2020-11-09T17:30:01Z --- interactive-fiction.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'interactive-fiction.html') diff --git a/interactive-fiction.html b/interactive-fiction.html index fa9d565f1118..0bae41498082 100644 --- a/interactive-fiction.html +++ b/interactive-fiction.html @@ -30,47 +30,49 @@ 10
$ pmaint sync interactive-fiction
- 11
warning: Pulling without specifying how to reconcile divergent branches is
+            11
WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', 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
Already up to date.
+            24
 

-            25
*** syncing interactive-fiction
+            25
Already up to date.
 

-            26
*** synced interactive-fiction
+            26
*** syncing interactive-fiction
 

-            27
 * Sync succeeded
+            27
*** synced interactive-fiction
 

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

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

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

-            31
 * Cache regenerated successfully
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 interactive-fiction
+

+            32
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-18-g5258