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