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 --- salfter.html | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) (limited to 'salfter.html') diff --git a/salfter.html b/salfter.html index 81e64d277bf7..b56ed35a742a 100644 --- a/salfter.html +++ b/salfter.html @@ -30,23 +30,49 @@ 10
$ pmaint sync salfter
- 11
Already up to date.
+            11
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            13
*** synced salfter
+            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 salfter
+            17
  git config pull.ff only       # fast-forward only
 

-            18
 * dev-python/jsonrpc-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            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 salfter
+

+            26
*** synced salfter
+

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

+            31
 * dev-python/jsonrpc-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            19
 * Cache regen failed with 1
+            32
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad