From f6d3557d15e24032f3a2734f256dc884e58051c6 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 19 Oct 2020 04:34:59 +0000 Subject: 2020-10-19T04:30:01Z --- sogo-connector.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'sogo-connector.html') diff --git a/sogo-connector.html b/sogo-connector.html index 28206299dcca..7a5b118da2fb 100644 --- a/sogo-connector.html +++ b/sogo-connector.html @@ -42,49 +42,47 @@ 16
$ pmaint sync sogo-connector
- 17
WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            20
commands sometime before your next pull:
+            20
 

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

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

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

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

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

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

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

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

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** syncing sogo-connector
 

-            32
*** syncing sogo-connector
+            32
*** synced sogo-connector
 

-            33
*** synced sogo-connector
+            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 1 sogo-connector
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sogo-connector
-

-            38
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad