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