From 30fbcdd2f2972e5ce41432bb88e09222e25939aa Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 9 Mar 2021 13:21:08 +0000 Subject: 2021-03-09T11:15:01Z --- pixlra.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'pixlra.html') diff --git a/pixlra.html b/pixlra.html index 42373d4189bf..66695a8aa891 100644 --- a/pixlra.html +++ b/pixlra.html @@ -48,49 +48,47 @@ 19
WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
- 20
WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            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
*** syncing pixlra
 

-            35
*** syncing pixlra
+            35
*** synced pixlra
 

-            36
*** synced pixlra
+            36
 * Sync succeeded
 

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

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

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

-            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 pixlra
-

-            41
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad