From e5de98d7bc70d8b1e09fcf616ce129d2e4eddd6b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 16 Aug 2020 06:35:42 +0000 Subject: 2020-08-16T06:30:01Z --- ShyPixie.html | 48 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 11 deletions(-) (limited to 'ShyPixie.html') diff --git a/ShyPixie.html b/ShyPixie.html index f315eb706c61..7dcd8546cc97 100644 --- a/ShyPixie.html +++ b/ShyPixie.html @@ -32,27 +32,53 @@ 11
$ pmaint sync ShyPixie
- 12
Already up to date.
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

-            13
*** syncing ShyPixie
+            13
discouraged. You can squelch this message by running one of the following
 

-            14
*** synced ShyPixie
+            14
commands sometime before your next pull:
 

-            15
 * Sync succeeded
+            15
 

-            16
$ git log --format=%ci -1
+            16
  git config pull.rebase false  # merge (the default strategy)
 

-            17
$ git show -q --pretty=format:%G? HEAD
+            17
  git config pull.rebase true   # rebase
 

-            18
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ShyPixie
+            18
  git config pull.ff only       # fast-forward only
 

-            19
 * games-util/steam-tools-0.8.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            19
+

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

+            21
preference for all repositories. You can also pass --rebase, --no-rebase,
+

+            22
or --ff-only on the command line to override the configured default per
+

+            23
invocation.
+

+            24
+

+            25
Already up to date.
+

+            26
*** syncing ShyPixie
+

+            27
*** synced ShyPixie
+

+            28
 * Sync succeeded
+

+            29
$ git log --format=%ci -1
+

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

+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 ShyPixie
+

+            32
 * games-util/steam-tools-0.8.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            20
 * games-util/steam-tools-2.0.2_beta: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            33
 * games-util/steam-tools-2.0.2_beta: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            21
 * x11-misc/openbox-menu-9999-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            34
 * x11-misc/openbox-menu-9999-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            22
 * Cache regen failed with 1
+            35
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad