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 --- ikelos.html | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) (limited to 'ikelos.html') diff --git a/ikelos.html b/ikelos.html index 4a60c935ab3b..20253cfa7d58 100644 --- a/ikelos.html +++ b/ikelos.html @@ -38,49 +38,53 @@ 14
 'status': 'unofficial'}
- 15
$ pmaint sync ikelos
+            15
pkgcore 0.11.2 -- extended version info unavailable
 

-            16
*** syncing ikelos
+            16
 

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

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

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

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

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

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

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

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

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

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

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

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

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

-            30
Already up to date.
+            30
invocation.
 

-            31
*** synced ikelos
+            31
 

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

-            33
$ git log --format=%ci -1
+            33
*** synced ikelos
 

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

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

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

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

+            38
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-18-g5258