From 345e2a5295daa1d4ed63ff9f92d54f8b26349836 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 30 Apr 2021 07:19:56 +0000 Subject: 2021-04-30T07:15:01Z --- brother-overlay.html | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) (limited to 'brother-overlay.html') diff --git a/brother-overlay.html b/brother-overlay.html index ba6dde5534b6..36e892c0a59f 100644 --- a/brother-overlay.html +++ b/brother-overlay.html @@ -40,49 +40,53 @@ 15
 'status': 'unofficial'}
- 16
$ pmaint sync brother-overlay
+            16
pkgcore 0.11.2 -- extended version info unavailable
 

-            17
*** syncing brother-overlay
+            17
 

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

-            19
discouraged. You can squelch this message by running one of the following
+            19
*** syncing brother-overlay
 

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

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

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

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

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

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

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

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

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

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

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

-            31
Already up to date.
+            31
invocation.
 

-            32
*** synced brother-overlay
+            32
 

-            33
 * Sync succeeded
+            33
Already up to date.
 

-            34
$ git log --format=%ci -1
+            34
*** synced brother-overlay
 

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

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 brother-overlay
+            36
$ git log --format=%ci -1
 

-            37
 * Cache regenerated successfully
+            37
$ git show -q --pretty=format:%G? HEAD
+

+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 brother-overlay
+

+            39
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad