From d37ea3c06b7fa4939d400d1256d1adeafff24f57 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 18 Nov 2020 08:07:10 +0000 Subject: 2020-11-18T08:00:02Z --- pg_overlay.html | 54 ++++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) (limited to 'pg_overlay.html') diff --git a/pg_overlay.html b/pg_overlay.html index 83783479ce1d..6a1b93653988 100644 --- a/pg_overlay.html +++ b/pg_overlay.html @@ -34,59 +34,49 @@ 12
$ pmaint sync pg_overlay
- 13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
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).
 

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

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

-            16
+            16
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            25
+            25
invocation.
 

-            26
From https://gitlab.com/Perfect_Gentleman/PG_Overlay
+            26
 

-            27
   c315fb9..024d7e9  master     -> origin/master
+            27
Already up to date.
 

-            28
Updating c315fb9..024d7e9
+            28
*** syncing pg_overlay
 

-            29
Fast-forward
+            29
*** synced pg_overlay
 

-            30
 dev-lang/rust/Manifest                | 2 +-
+            30
 * Sync succeeded
 

-            31
 dev-lang/rust/rust-1.48.0_beta.ebuild | 2 +-
+            31
$ git log --format=%ci -1
 

-            32
 2 files changed, 2 insertions(+), 2 deletions(-)
+            32
$ git show -q --pretty=format:%G? HEAD
 

-            33
*** syncing pg_overlay
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pg_overlay
 

-            34
*** synced pg_overlay
-

-            35
 * Sync succeeded
-

-            36
$ git log --format=%ci -1
-

-            37
$ git show -q --pretty=format:%G? HEAD
-

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

-            39
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad