From 16520ee5bc111105f165d9c391374b6ed5cc4b7b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 25 Oct 2020 00:35:04 +0000 Subject: 2020-10-25T00:30:01Z --- sabayon-distro.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'sabayon-distro.html') diff --git a/sabayon-distro.html b/sabayon-distro.html index 7b37b78d339e..801908b29f75 100644 --- a/sabayon-distro.html +++ b/sabayon-distro.html @@ -36,49 +36,47 @@ 13
$ pmaint sync sabayon-distro
 
- 14
WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 
- 15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 
- 16
discouraged. You can squelch this message by running one of the following
+            16
commands sometime before your next pull:
 
- 17
commands sometime before your next pull:
+            17
 
- 18
+            18
  git config pull.rebase false  # merge (the default strategy)
 
- 19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.rebase true   # rebase
 
- 20
  git config pull.rebase true   # rebase
+            20
  git config pull.ff only       # fast-forward only
 
- 21
  git config pull.ff only       # fast-forward only
+            21
 
- 22
+            22
You can replace "git config" with "git config --global" to set a default
 
- 23
You can replace "git config" with "git config --global" to set a default
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
or --ff-only on the command line to override the configured default per
 
- 25
or --ff-only on the command line to override the configured default per
+            25
invocation.
 
- 26
invocation.
+            26
 
- 27
+            27
Already up to date.
 
- 28
Already up to date.
+            28
*** syncing sabayon-distro
 
- 29
*** syncing sabayon-distro
+            29
*** synced sabayon-distro
 
- 30
*** synced sabayon-distro
+            30
 * Sync succeeded
 
- 31
 * Sync succeeded
+            31
$ git log --format=%ci -1
 
- 32
$ git log --format=%ci -1
+            32
$ git show -q --pretty=format:%G? HEAD
 
- 33
$ git show -q --pretty=format:%G? HEAD
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sabayon-distro
 
- 34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sabayon-distro
-
- 35
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 
-- cgit v1.2.3-65-gdbad