From 4277dc561ed52a737adf7e19a8cb94334197c983 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 19 Nov 2020 09:35:16 +0000 Subject: 2020-11-19T09:30:01Z --- youbroketheinternet.html | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) (limited to 'youbroketheinternet.html') diff --git a/youbroketheinternet.html b/youbroketheinternet.html index ae2a12e0a485..c24a5a689636 100644 --- a/youbroketheinternet.html +++ b/youbroketheinternet.html @@ -56,27 +56,51 @@ 23
 'status': 'unofficial'}
- 24
 * Adding new repository
+            24
$ pmaint sync youbroketheinternet
 

-            25
$ pmaint sync youbroketheinternet
+            25
warning: Pulling without specifying how to reconcile divergent branches is
 

-            26
Cloning into '/var/lib/repo-mirror-ci/sync/youbroketheinternet'...
+            26
discouraged. You can squelch this message by running one of the following
 

-            27
warning: redirecting to https://git.gnunet.org/youbroketheinternet-overlay.git/
+            27
commands sometime before your next pull:
 

-            28
*** syncing youbroketheinternet
+            28
 

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

-            30
 * Sync succeeded
+            30
  git config pull.rebase true   # rebase
 

-            31
$ git log --format=%ci -1
+            31
  git config pull.ff only       # fast-forward only
 

-            32
$ git show -q --pretty=format:%G? HEAD
+            32
 

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 youbroketheinternet
+            33
You can replace "git config" with "git config --global" to set a default
 

-            34
 * Cache regenerated successfully
+            34
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
invocation.
+

+            37
+

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

+            39
Already up to date.
+

+            40
*** syncing youbroketheinternet
+

+            41
*** synced youbroketheinternet
+

+            42
 * Sync succeeded
+

+            43
$ git log --format=%ci -1
+

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

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

+            46
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad