From f21335c10ce0d9d6950fe5932b0b233565e02557 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 4 Oct 2020 02:05:10 +0000 Subject: 2020-10-04T02:00:01Z --- flow.html | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'flow.html') diff --git a/flow.html b/flow.html index 6be99841a210..859ce58ad97e 100644 --- a/flow.html +++ b/flow.html @@ -32,51 +32,47 @@ 11
$ pmaint sync flow
- 12
WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

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

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

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

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

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

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

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

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

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

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

-            25
invocation.
+            25
Already up to date.
 

-            26
+            26
*** syncing flow
 

-            27
Already up to date.
+            27
*** synced flow
 

-            28
*** syncing flow
+            28
 * Sync succeeded
 

-            29
*** synced flow
+            29
$ git log --format=%ci -1
 

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

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

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

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flow
-

-            34
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad