From 95290cda9c295a4091f0c34711889d64187b1d21 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 16 Oct 2020 19:34:56 +0000 Subject: 2020-10-16T19:30:01Z --- holgersson-overlay.html | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'holgersson-overlay.html') diff --git a/holgersson-overlay.html b/holgersson-overlay.html index 37963a988ecf..f065a4ba3686 100644 --- a/holgersson-overlay.html +++ b/holgersson-overlay.html @@ -30,25 +30,49 @@ 10
 'status': 'unofficial'}
- 11
 * Adding new repository
+            11
$ pmaint sync holgersson-overlay
 

-            12
$ pmaint sync holgersson-overlay
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            14
*** syncing holgersson-overlay
+            14
commands sometime before your next pull:
 

-            15
*** synced holgersson-overlay
+            15
 

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

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

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

-            19
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 holgersson-overlay
+            19
 

-            20
 * Cache regenerated successfully
+            20
You can replace "git config" with "git config --global" to set a default
+

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

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

+            23
invocation.
+

+            24
+

+            25
Already up to date.
+

+            26
*** syncing holgersson-overlay
+

+            27
*** synced holgersson-overlay
+

+            28
 * Sync succeeded
+

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

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

+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 holgersson-overlay
+

+            32
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad