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

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

-            17
*** synced ace
+            17
commands sometime before your next pull:
 

-            18
 * Sync succeeded
+            18
 

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

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

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

-            22
 * Cache regenerated successfully
+            22
+

+            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 ace
+

+            30
*** synced ace
+

+            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 ace
+

+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad