From 29d7217b88e5515410f6a5dc26c96fbac0993725 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 10 Dec 2020 11:28:21 +0000 Subject: 2020-12-10T11:00:01Z --- octopus.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'octopus.html') diff --git a/octopus.html b/octopus.html index 2bd87a9a2324..f37c917013fb 100644 --- a/octopus.html +++ b/octopus.html @@ -28,49 +28,47 @@ 9
$ pmaint sync octopus
- 10
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).
+            10
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            13
commands sometime before your next pull:
+            13
 

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

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

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

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

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

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

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

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

-            22
invocation.
+            22
 

-            23
+            23
Already up to date.
 

-            24
Already up to date.
+            24
*** syncing octopus
 

-            25
*** syncing octopus
+            25
*** synced octopus
 

-            26
*** synced octopus
+            26
 * Sync succeeded
 

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

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

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

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 octopus
-

-            31
 * Cache regenerated successfully
+            30
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad