From 8f8226cad25e0c39f4f334ed14b68fa417d01ebd Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 13 Mar 2021 17:35:57 +0000 Subject: 2021-03-13T17:30:01Z --- blender-gentoo-logo.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'blender-gentoo-logo.html') diff --git a/blender-gentoo-logo.html b/blender-gentoo-logo.html index 0da390d26cbb..ae2d60a20fca 100644 --- a/blender-gentoo-logo.html +++ b/blender-gentoo-logo.html @@ -40,49 +40,47 @@ 15
$ pmaint sync blender-gentoo-logo
- 16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            19
commands sometime before your next pull:
+            19
 

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

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

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

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

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

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

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

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

-            28
invocation.
+            28
 

-            29
+            29
Already up to date.
 

-            30
Already up to date.
+            30
*** syncing blender-gentoo-logo
 

-            31
*** syncing blender-gentoo-logo
+            31
*** synced blender-gentoo-logo
 

-            32
*** synced blender-gentoo-logo
+            32
 * Sync succeeded
 

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

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

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 blender-gentoo-logo
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 blender-gentoo-logo
-

-            37
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad