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 --- alexxy.html | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) (limited to 'alexxy.html') diff --git a/alexxy.html b/alexxy.html index 069fcdf8bfad..6b7f68679f43 100644 --- a/alexxy.html +++ b/alexxy.html @@ -40,21 +40,47 @@ 15
$ pmaint sync alexxy
- 16
Already up to date.
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            18
*** synced alexxy
+            18
commands sometime before your next pull:
 

-            19
 * Sync succeeded
+            19
 

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

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

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

-            23
 * Cache regenerated successfully
+            23
+

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

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

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

+            27
invocation.
+

+            28
+

+            29
Already up to date.
+

+            30
*** syncing alexxy
+

+            31
*** synced alexxy
+

+            32
 * Sync succeeded
+

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

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

+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 alexxy
+

+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad