From 5a64bfd5050ae729421e1aa8fc03f5d6e62fcdc3 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 10 Dec 2020 14:12:50 +0000 Subject: 2020-12-10T14:00:01Z --- sam_c.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'sam_c.html') diff --git a/sam_c.html b/sam_c.html index d6586e526f70..ee8274c8186c 100644 --- a/sam_c.html +++ b/sam_c.html @@ -32,49 +32,47 @@ 11
$ pmaint sync sam_c
- 12
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            15
commands sometime before your next pull:
+            15
 

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

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

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

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

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

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

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

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

-            24
invocation.
+            24
 

-            25
+            25
Already up to date.
 

-            26
Already up to date.
+            26
*** syncing sam_c
 

-            27
*** syncing sam_c
+            27
*** synced sam_c
 

-            28
*** synced sam_c
+            28
 * Sync succeeded
 

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

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

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

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sam_c
-

-            33
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad