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