From d2a36f03634b27aef623d8e29675f6ddfb0aa8b8 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 6 Oct 2020 04:35:18 +0000 Subject: 2020-10-06T04:30:02Z --- KBrown-pub.html | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) (limited to 'KBrown-pub.html') diff --git a/KBrown-pub.html b/KBrown-pub.html index 302fd641a855..ddff33d5a1d8 100644 --- a/KBrown-pub.html +++ b/KBrown-pub.html @@ -36,25 +36,49 @@ 13
 'status': 'unofficial'}
- 14
 * Adding new repository
+            14
$ pmaint sync KBrown-pub
 

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

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

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

-            18
*** synced KBrown-pub
+            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 KBrown-pub
+            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 KBrown-pub
+

+            30
*** synced KBrown-pub
+

+            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 KBrown-pub
+

+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad