From d1e9afa8fbf9f68d3a80610c582a3e893697e6a8 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 24 Mar 2022 00:48:58 +0000 Subject: 2022-03-24T00:45:01Z --- vGist.html | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'vGist.html') diff --git a/vGist.html b/vGist.html index 631464679ca8..8f1034345bca 100644 --- a/vGist.html +++ b/vGist.html @@ -38,47 +38,45 @@ 14
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist
 
- 15
WARNING:pkgcore:tmacedo repo at '/var/lib/repo-mirror-ci/sync/tmacedo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
*** syncing vGist
 
- 16
*** syncing vGist
+            16
hint: Pulling without specifying how to reconcile divergent branches is
 
- 17
hint: Pulling without specifying how to reconcile divergent branches is
+            17
hint: discouraged. You can squelch this message by running one of the following
 
- 18
hint: discouraged. You can squelch this message by running one of the following
+            18
hint: commands sometime before your next pull:
 
- 19
hint: commands sometime before your next pull:
+            19
hint: 
 
- 20
hint: 
+            20
hint:   git config pull.rebase false  # merge (the default strategy)
 
- 21
hint:   git config pull.rebase false  # merge (the default strategy)
+            21
hint:   git config pull.rebase true   # rebase
 
- 22
hint:   git config pull.rebase true   # rebase
+            22
hint:   git config pull.ff only       # fast-forward only
 
- 23
hint:   git config pull.ff only       # fast-forward only
+            23
hint: 
 
- 24
hint: 
+            24
hint: You can replace "git config" with "git config --global" to set a default
 
- 25
hint: You can replace "git config" with "git config --global" to set a default
+            25
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 26
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+            26
hint: or --ff-only on the command line to override the configured default per
 
- 27
hint: or --ff-only on the command line to override the configured default per
+            27
hint: invocation.
 
- 28
hint: invocation.
+            28
Already up to date.
 
- 29
Already up to date.
+            29
*** synced vGist
 
- 30
*** synced vGist
+            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 --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 vGist
 
- 34
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 vGist
-
- 35
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 
-- cgit v1.2.3-65-gdbad