From 9cf164fa4b68b2829b7a94077931e60fae2aa907 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 5 Oct 2020 22:40:44 +0000 Subject: 2020-10-05T22:30:01Z --- barnowl.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'barnowl.html') diff --git a/barnowl.html b/barnowl.html index 0499bc8c4f52..cdb0ef188832 100644 --- a/barnowl.html +++ b/barnowl.html @@ -38,49 +38,47 @@ 14
$ pmaint sync barnowl
- 15
WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

-            16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
discouraged. You can squelch this message by running one of the following
 

-            17
discouraged. You can squelch this message by running one of the following
+            17
commands sometime before your next pull:
 

-            18
commands sometime before your next pull:
+            18
 

-            19
+            19
  git config pull.rebase false  # merge (the default strategy)
 

-            20
  git config pull.rebase false  # merge (the default strategy)
+            20
  git config pull.rebase true   # rebase
 

-            21
  git config pull.rebase true   # rebase
+            21
  git config pull.ff only       # fast-forward only
 

-            22
  git config pull.ff only       # fast-forward only
+            22
 

-            23
+            23
You can replace "git config" with "git config --global" to set a default
 

-            24
You can replace "git config" with "git config --global" to set a default
+            24
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
or --ff-only on the command line to override the configured default per
 

-            26
or --ff-only on the command line to override the configured default per
+            26
invocation.
 

-            27
invocation.
+            27
 

-            28
+            28
Already up to date.
 

-            29
Already up to date.
+            29
*** syncing barnowl
 

-            30
*** syncing barnowl
+            30
*** synced barnowl
 

-            31
*** synced barnowl
+            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 1 barnowl
 

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 barnowl
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad