From e5de98d7bc70d8b1e09fcf616ce129d2e4eddd6b Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 16 Aug 2020 06:35:42 +0000 Subject: 2020-08-16T06:30:01Z --- concaveoverlay.html | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) (limited to 'concaveoverlay.html') diff --git a/concaveoverlay.html b/concaveoverlay.html index 7928a0fc5d20..2226ad39e4bd 100644 --- a/concaveoverlay.html +++ b/concaveoverlay.html @@ -30,21 +30,47 @@ 10
$ pmaint sync concaveoverlay
- 11
Already up to date.
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

-            12
*** syncing concaveoverlay
+            12
discouraged. You can squelch this message by running one of the following
 

-            13
*** synced concaveoverlay
+            13
commands sometime before your next pull:
 

-            14
 * Sync succeeded
+            14
 

-            15
$ git log --format=%ci -1
+            15
  git config pull.rebase false  # merge (the default strategy)
 

-            16
$ git show -q --pretty=format:%G? HEAD
+            16
  git config pull.rebase true   # rebase
 

-            17
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 concaveoverlay
+            17
  git config pull.ff only       # fast-forward only
 

-            18
 * Cache regenerated successfully
+            18
+

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

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

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

+            22
invocation.
+

+            23
+

+            24
Already up to date.
+

+            25
*** syncing concaveoverlay
+

+            26
*** synced concaveoverlay
+

+            27
 * Sync succeeded
+

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

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

+            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 concaveoverlay
+

+            31
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad