From 7f96dc9990d017fb02b2b289fbfc797d58ed64f3 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 14 Jan 2021 15:05:00 +0000 Subject: 2021-01-14T15:00:01Z --- youbroketheinternet.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'youbroketheinternet.html') diff --git a/youbroketheinternet.html b/youbroketheinternet.html index 289820074ee2..c24a5a689636 100644 --- a/youbroketheinternet.html +++ b/youbroketheinternet.html @@ -58,51 +58,49 @@ 24
$ pmaint sync youbroketheinternet
- 25
WARNING:pkgcore:KBrown-pub repo at '/var/lib/repo-mirror-ci/sync/KBrown-pub', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            28
commands sometime before your next pull:
+            28
 

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

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

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

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

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

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

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

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

-            37
invocation.
+            37
 

-            38
+            38
warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/
 

-            39
warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/
+            39
Already up to date.
 

-            40
Already up to date.
+            40
*** syncing youbroketheinternet
 

-            41
*** syncing youbroketheinternet
+            41
*** synced youbroketheinternet
 

-            42
*** synced youbroketheinternet
+            42
 * Sync succeeded
 

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

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

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

-            46
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 youbroketheinternet
-

-            47
 * Cache regenerated successfully
+            46
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad