From 17312bc491bd0843dd1351fdd4c0dab2a1e178da Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 3 May 2021 08:34:56 +0000 Subject: 2021-05-03T08:30:01Z --- jmbsvicetto.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'jmbsvicetto.html') diff --git a/jmbsvicetto.html b/jmbsvicetto.html index b77b054280e1..191b332c81ec 100644 --- a/jmbsvicetto.html +++ b/jmbsvicetto.html @@ -46,49 +46,47 @@ 18
$ pmaint sync jmbsvicetto
- 19
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).
+            19
*** syncing jmbsvicetto
 

-            20
*** syncing jmbsvicetto
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            23
commands sometime before your next pull:
+            23
 

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

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

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

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

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

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

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

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

-            32
invocation.
+            32
 

-            33
+            33
Already up to date.
 

-            34
Already up to date.
+            34
*** synced jmbsvicetto
 

-            35
*** synced jmbsvicetto
+            35
 * Sync succeeded
 

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

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

-            38
$ git show -q --pretty=format:%G? HEAD
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jmbsvicetto
 

-            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jmbsvicetto
-

-            40
 * Cache regenerated successfully
+            39
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad