From 8fc0b36519bab0c859d80f139bc0c8715e865c7e Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 12:36:44 +0000 Subject: 2020-10-23T12:00:01Z --- fowlay.html | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) (limited to 'fowlay.html') diff --git a/fowlay.html b/fowlay.html index a2ddeafb6ef0..e0a6d73a81db 100644 --- a/fowlay.html +++ b/fowlay.html @@ -34,47 +34,53 @@ 12
$ pmaint sync fowlay
- 13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', 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:pkgcore:displacer repo at '/var/lib/repo-mirror-ci/sync/displacer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
commands sometime before your next pull:
+            15
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
  git config pull.rebase false  # merge (the default strategy)
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
  git config pull.rebase true   # rebase
+            18
commands sometime before your next pull:
 

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

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

-            21
You can replace "git config" with "git config --global" to set a default
+            21
  git config pull.rebase true   # rebase
 

-            22
preference for all repositories. You can also pass --rebase, --no-rebase,
+            22
  git config pull.ff only       # fast-forward only
 

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

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

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

-            26
Already up to date.
+            26
or --ff-only on the command line to override the configured default per
 

-            27
*** syncing fowlay
+            27
invocation.
 

-            28
*** synced fowlay
+            28
 

-            29
 * Sync succeeded
+            29
Already up to date.
 

-            30
$ git log --format=%ci -1
+            30
*** syncing fowlay
 

-            31
$ git show -q --pretty=format:%G? HEAD
+            31
*** synced fowlay
 

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fowlay
+            32
 * Sync succeeded
 

-            33
 * Cache regenerated successfully
+            33
$ git log --format=%ci -1
+

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

+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 fowlay
+

+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad