From feb9d77f8ffbd06e77705f1ba2e7e0f841b96f7b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 28 Jan 2021 20:32:43 +0000 Subject: 2021-01-28T20:00:01Z --- sping.html | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'sping.html') diff --git a/sping.html b/sping.html index 5f5f2a5f79d3..2de6e42aa299 100644 --- a/sping.html +++ b/sping.html @@ -44,51 +44,47 @@ 17
$ pmaint sync sping
- 18
WARNING:pkgcore:holgersson-overlay repo at '/var/lib/repo-mirror-ci/sync/holgersson-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
warning: Pulling without specifying how to reconcile divergent branches is
 

-            19
WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
discouraged. You can squelch this message by running one of the following
 

-            20
warning: Pulling without specifying how to reconcile divergent branches is
+            20
commands sometime before your next pull:
 

-            21
discouraged. You can squelch this message by running one of the following
+            21
 

-            22
commands sometime before your next pull:
+            22
  git config pull.rebase false  # merge (the default strategy)
 

-            23
+            23
  git config pull.rebase true   # rebase
 

-            24
  git config pull.rebase false  # merge (the default strategy)
+            24
  git config pull.ff only       # fast-forward only
 

-            25
  git config pull.rebase true   # rebase
+            25
 

-            26
  git config pull.ff only       # fast-forward only
+            26
You can replace "git config" with "git config --global" to set a default
 

-            27
+            27
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
You can replace "git config" with "git config --global" to set a default
+            28
or --ff-only on the command line to override the configured default per
 

-            29
preference for all repositories. You can also pass --rebase, --no-rebase,
+            29
invocation.
 

-            30
or --ff-only on the command line to override the configured default per
+            30
 

-            31
invocation.
+            31
Already up to date.
 

-            32
+            32
*** syncing sping
 

-            33
Already up to date.
+            33
*** synced sping
 

-            34
*** syncing sping
+            34
 * Sync succeeded
 

-            35
*** synced sping
+            35
$ git log --format=%ci -1
 

-            36
 * Sync succeeded
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
$ git log --format=%ci -1
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sping
 

-            38
$ git show -q --pretty=format:%G? HEAD
-

-            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sping
-

-            40
 * Cache regenerated successfully
+            38
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad