From 2ffb41e08c4966ad8814f3cea74105e78364fe0b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 20 Nov 2020 12:35:51 +0000 Subject: 2020-11-20T12:30:01Z --- webos.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'webos.html') diff --git a/webos.html b/webos.html index 4fe2de6d8be4..c92e041b1e03 100644 --- a/webos.html +++ b/webos.html @@ -40,47 +40,49 @@ 15
$ pmaint sync webos
 
- 16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
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
discouraged. You can squelch this message by running one of the following
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 
- 18
commands sometime before your next pull:
+            18
discouraged. You can squelch this message by running one of the following
 
- 19
+            19
commands sometime before your next pull:
 
- 20
  git config pull.rebase false  # merge (the default strategy)
+            20
 
- 21
  git config pull.rebase true   # rebase
+            21
  git config pull.rebase false  # merge (the default strategy)
 
- 22
  git config pull.ff only       # fast-forward only
+            22
  git config pull.rebase true   # rebase
 
- 23
+            23
  git config pull.ff only       # fast-forward only
 
- 24
You can replace "git config" with "git config --global" to set a default
+            24
 
- 25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
You can replace "git config" with "git config --global" to set a default
 
- 26
or --ff-only on the command line to override the configured default per
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 27
invocation.
+            27
or --ff-only on the command line to override the configured default per
 
- 28
+            28
invocation.
 
- 29
Already up to date.
+            29
 
- 30
*** syncing webos
+            30
Already up to date.
 
- 31
*** synced webos
+            31
*** syncing webos
 
- 32
 * Sync succeeded
+            32
*** synced webos
 
- 33
$ git log --format=%ci -1
+            33
 * Sync succeeded
 
- 34
$ git show -q --pretty=format:%G? HEAD
+            34
$ git log --format=%ci -1
 
- 35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 webos
+            35
$ git show -q --pretty=format:%G? HEAD
 
- 36
 * Cache regenerated successfully
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 webos
+
+ 37
 * Cache regenerated successfully
 
-- cgit v1.2.3-65-gdbad