From bd5948584ac48da49f6a3ee1f1a64c3c828f1f3b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 5 Jan 2021 17:05:00 +0000 Subject: 2021-01-05T17:00:01Z --- natinst.html | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'natinst.html') diff --git a/natinst.html b/natinst.html index 7657981e689d..b651aca74d11 100644 --- a/natinst.html +++ b/natinst.html @@ -38,49 +38,47 @@ 14
$ pmaint sync natinst
- 15
WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            18
commands sometime before your next pull:
+            18
 

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

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

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

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

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

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

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

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

-            27
invocation.
+            27
 

-            28
+            28
Already up to date.
 

-            29
Already up to date.
+            29
*** syncing natinst
 

-            30
*** syncing natinst
+            30
*** synced natinst
 

-            31
*** synced natinst
+            31
 * Sync succeeded
 

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

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

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

-            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 natinst
-

-            36
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad