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 --- 4nykey.html | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) (limited to '4nykey.html') diff --git a/4nykey.html b/4nykey.html index 817c26f7133e..82fafe73898d 100644 --- a/4nykey.html +++ b/4nykey.html @@ -36,21 +36,47 @@ 13
$ pmaint sync 4nykey
- 14
Already up to date.
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

-            15
*** syncing 4nykey
+            15
discouraged. You can squelch this message by running one of the following
 

-            16
*** synced 4nykey
+            16
commands sometime before your next pull:
 

-            17
 * Sync succeeded
+            17
 

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

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

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

-            21
 * Cache regenerated successfully
+            21
+

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

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

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

+            25
invocation.
+

+            26
+

+            27
Already up to date.
+

+            28
*** syncing 4nykey
+

+            29
*** synced 4nykey
+

+            30
 * Sync succeeded
+

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

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

+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 4nykey
+

+            34
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad