From 3c55faaa097e34bf6f9a1dcc06381c41e9c28010 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 30 Nov 2020 23:35:13 +0000 Subject: 2020-11-30T23:30:01Z --- toniz4-overlay.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'toniz4-overlay.html') diff --git a/toniz4-overlay.html b/toniz4-overlay.html index 84c8ee04905e..8f21b0a61053 100644 --- a/toniz4-overlay.html +++ b/toniz4-overlay.html @@ -30,49 +30,47 @@ 10
$ pmaint sync toniz4-overlay
- 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).
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            14
commands sometime before your next pull:
+            14
 

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

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

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

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

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

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

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

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

-            23
invocation.
+            23
 

-            24
+            24
Already up to date.
 

-            25
Already up to date.
+            25
*** syncing toniz4-overlay
 

-            26
*** syncing toniz4-overlay
+            26
*** synced toniz4-overlay
 

-            27
*** synced toniz4-overlay
+            27
 * Sync succeeded
 

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

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

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

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 toniz4-overlay
-

-            32
 * Cache regenerated successfully
+            31
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad