From 6c0b3f7f93a361dadc86d37223d45fda3b9ac8c4 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 20 Dec 2020 13:34:57 +0000 Subject: 2020-12-20T13:30:01Z --- natinst.html | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'natinst.html') diff --git a/natinst.html b/natinst.html index ffcf9d119b74..b651aca74d11 100644 --- a/natinst.html +++ b/natinst.html @@ -36,25 +36,49 @@ 13
 'status': 'unofficial'}
- 14
 * Adding new repository
+            14
$ pmaint sync natinst
 

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

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

-            17
*** syncing natinst
+            17
commands sometime before your next pull:
 

-            18
*** synced natinst
+            18
 

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

-            20
$ git log --format=%ci -1
+            20
  git config pull.rebase true   # rebase
 

-            21
$ git show -q --pretty=format:%G? HEAD
+            21
  git config pull.ff only       # fast-forward only
 

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

-            23
 * Cache regenerated successfully
+            23
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
or --ff-only on the command line to override the configured default per
+

+            26
invocation.
+

+            27
+

+            28
Already up to date.
+

+            29
*** syncing natinst
+

+            30
*** synced natinst
+

+            31
 * Sync succeeded
+

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

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

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

+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad