From 00f52a7a587bf064554a71ff67c570ae3e148670 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 26 Sep 2020 04:37:07 +0000 Subject: 2020-09-26T04:30:01Z --- tante.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'tante.html') diff --git a/tante.html b/tante.html index 6e38a06c899d..5882a1da0d46 100644 --- a/tante.html +++ b/tante.html @@ -26,47 +26,49 @@ 8
$ pmaint sync tante
- 9
warning: Pulling without specifying how to reconcile divergent branches is
+            9
WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            12
+            12
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            21
+            21
invocation.
 

-            22
Already up to date.
+            22
 

-            23
*** syncing tante
+            23
Already up to date.
 

-            24
*** synced tante
+            24
*** syncing tante
 

-            25
 * Sync succeeded
+            25
*** synced tante
 

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

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

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

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

+            30
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad