From 26473ae757f12b668f90750efeed3e177f49bf50 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 8 Sep 2020 11:05:10 +0000 Subject: 2020-09-08T11:00:01Z --- matrix.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'matrix.html') diff --git a/matrix.html b/matrix.html index 7fce225877c7..2210ac43907e 100644 --- a/matrix.html +++ b/matrix.html @@ -44,49 +44,47 @@ 17
$ pmaint sync matrix
- 18
WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            21
commands sometime before your next pull:
+            21
 

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

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

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

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

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

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

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

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

-            30
invocation.
+            30
 

-            31
+            31
Already up to date.
 

-            32
Already up to date.
+            32
*** syncing matrix
 

-            33
*** syncing matrix
+            33
*** synced matrix
 

-            34
*** synced matrix
+            34
 * Sync succeeded
 

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

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

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

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 matrix
-

-            39
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad