From dbadb42dc1984fe6dfba8f6229052f98065b970d Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 17 Oct 2020 23:05:45 +0000 Subject: 2020-10-17T23:00:01Z --- tmacedo.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'tmacedo.html') diff --git a/tmacedo.html b/tmacedo.html index ca0afa11ffb7..4bfa37fc0cff 100644 --- a/tmacedo.html +++ b/tmacedo.html @@ -32,47 +32,49 @@ 11
$ pmaint sync tmacedo
- 12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            15
+            15
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            24
+            24
invocation.
 

-            25
Already up to date.
+            25
 

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

-            27
*** synced tmacedo
+            27
*** syncing tmacedo
 

-            28
 * Sync succeeded
+            28
*** synced tmacedo
 

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

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

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

-            32
 * Cache regenerated successfully
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 tmacedo
+

+            33
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad