From 6698c8dc5f4306790cbaaf1c34e055ccb7f644bb Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 12 Nov 2020 01:05:20 +0000 Subject: 2020-11-12T01:00:01Z --- floppym.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'floppym.html') diff --git a/floppym.html b/floppym.html index ec687a2880d2..f752a7964a22 100644 --- a/floppym.html +++ b/floppym.html @@ -30,49 +30,47 @@ 10
$ pmaint sync floppym
- 11
WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            14
commands sometime before your next pull:
+            14
 

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

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

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

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

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

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

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

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

-            23
invocation.
+            23
 

-            24
+            24
Already up to date.
 

-            25
Already up to date.
+            25
*** syncing floppym
 

-            26
*** syncing floppym
+            26
*** synced floppym
 

-            27
*** synced floppym
+            27
 * Sync succeeded
 

-            28
 * Sync succeeded
+            28
$ git log --format=%ci -1
 

-            29
$ git log --format=%ci -1
+            29
$ git show -q --pretty=format:%G? HEAD
 

-            30
$ git show -q --pretty=format:%G? HEAD
+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 floppym
 

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 floppym
-

-            32
 * Cache regenerated successfully
+            31
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad