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 --- causelay.html | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) (limited to 'causelay.html') diff --git a/causelay.html b/causelay.html index 443b5481068d..1c3110349451 100644 --- a/causelay.html +++ b/causelay.html @@ -34,23 +34,49 @@ 12
$ pmaint sync causelay
- 13
Already up to date.
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            15
*** synced causelay
+            15
commands sometime before your next pull:
 

-            16
 * Sync succeeded
+            16
 

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

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

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

-            20
 * net-misc/svtplay-dl-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            20
+

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

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

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

+            24
invocation.
+

+            25
+

+            26
Already up to date.
+

+            27
*** syncing causelay
+

+            28
*** synced causelay
+

+            29
 * Sync succeeded
+

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

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

+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 causelay
+

+            33
 * net-misc/svtplay-dl-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            21
 * Cache regen failed with 1
+            34
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad