From b2ad123364c62b8c088ee9a20a228fd00421856b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 17 Oct 2020 23:34:56 +0000 Subject: 2020-10-17T23:30:01Z --- science.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'science.html') diff --git a/science.html b/science.html index af3d4c68f81b..da5b9e93cc4a 100644 --- a/science.html +++ b/science.html @@ -66,49 +66,47 @@ 28
$ pmaint sync science
- 29
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).
+            29
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            32
commands sometime before your next pull:
+            32
 

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

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

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

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

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

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

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

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

-            41
invocation.
+            41
 

-            42
+            42
Already up to date.
 

-            43
Already up to date.
+            43
*** syncing science
 

-            44
*** syncing science
+            44
*** synced science
 

-            45
*** synced science
+            45
 * Sync succeeded
 

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

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

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

-            49
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 science
-

-            50
 * Cache regenerated successfully
+            49
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad