From 345e2a5295daa1d4ed63ff9f92d54f8b26349836 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 30 Apr 2021 07:19:56 +0000 Subject: 2021-04-30T07:15:01Z --- robert7k.html | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) (limited to 'robert7k.html') diff --git a/robert7k.html b/robert7k.html index 05125b482748..12f2b1e6fc37 100644 --- a/robert7k.html +++ b/robert7k.html @@ -28,49 +28,53 @@ 9
 'status': 'unofficial'}
- 10
$ pmaint sync robert7k
+            10
pkgcore 0.11.2 -- extended version info unavailable
 

-            11
*** syncing robert7k
+            11
 

-            12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
$ pmaint sync robert7k
 

-            13
discouraged. You can squelch this message by running one of the following
+            13
*** syncing robert7k
 

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

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

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

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

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

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

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

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

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

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

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

-            25
Already up to date.
+            25
invocation.
 

-            26
*** synced robert7k
+            26
 

-            27
 * Sync succeeded
+            27
Already up to date.
 

-            28
$ git log --format=%ci -1
+            28
*** synced robert7k
 

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

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 robert7k
+            30
$ git log --format=%ci -1
 

-            31
 * Cache regenerated successfully
+            31
$ git show -q --pretty=format:%G? HEAD
+

+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 robert7k
+

+            33
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad