From 7d92d843b067a4640cbee4eb30ecfbb0367baf73 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 3 Sep 2020 10:05:11 +0000 Subject: 2020-09-03T10:00:01Z --- gnux32.html | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'gnux32.html') diff --git a/gnux32.html b/gnux32.html index c51be5b99b83..fe84631cd956 100644 --- a/gnux32.html +++ b/gnux32.html @@ -34,51 +34,47 @@ 12
$ pmaint sync gnux32
- 13
WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

-            14
WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
discouraged. You can squelch this message by running one of the following
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
commands sometime before your next pull:
 

-            16
discouraged. You can squelch this message by running one of the following
+            16
 

-            17
commands sometime before your next pull:
+            17
  git config pull.rebase false  # merge (the default strategy)
 

-            18
+            18
  git config pull.rebase true   # rebase
 

-            19
  git config pull.rebase false  # merge (the default strategy)
+            19
  git config pull.ff only       # fast-forward only
 

-            20
  git config pull.rebase true   # rebase
+            20
 

-            21
  git config pull.ff only       # fast-forward only
+            21
You can replace "git config" with "git config --global" to set a default
 

-            22
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            23
You can replace "git config" with "git config --global" to set a default
+            23
or --ff-only on the command line to override the configured default per
 

-            24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
invocation.
 

-            25
or --ff-only on the command line to override the configured default per
+            25
 

-            26
invocation.
+            26
Already up to date.
 

-            27
+            27
*** syncing gnux32
 

-            28
Already up to date.
+            28
*** synced gnux32
 

-            29
*** syncing gnux32
+            29
 * Sync succeeded
 

-            30
*** synced gnux32
+            30
$ git log --format=%ci -1
 

-            31
 * Sync succeeded
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
$ git log --format=%ci -1
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnux32
 

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

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gnux32
-

-            35
 * Cache regenerated successfully
+            33
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad