From dfef9a36e975f1f3ca189d958d0f7767ad76d35f Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 30 Aug 2020 16:05:03 +0000 Subject: 2020-08-30T16:00:01Z --- khoverlay.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'khoverlay.html') diff --git a/khoverlay.html b/khoverlay.html index 878edca7acd6..919b9c3cde6c 100644 --- a/khoverlay.html +++ b/khoverlay.html @@ -36,49 +36,47 @@ 13
$ pmaint sync khoverlay
- 14
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).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            17
commands sometime before your next pull:
+            17
 

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

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

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

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

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

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

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

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

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** syncing khoverlay
 

-            29
*** syncing khoverlay
+            29
*** synced khoverlay
 

-            30
*** synced khoverlay
+            30
 * Sync succeeded
 

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

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

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

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 khoverlay
-

-            35
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad