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

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

-            19
*** synced petkovich
+            19
commands sometime before your next pull:
 

-            20
 * Sync succeeded
+            20
 

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

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

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

-            24
 * Cache regenerated successfully
+            24
+

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

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

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

+            28
invocation.
+

+            29
+

+            30
Already up to date.
+

+            31
*** syncing petkovich
+

+            32
*** synced petkovich
+

+            33
 * Sync succeeded
+

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

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

+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 petkovich
+

+            37
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad