From 4ef5b705c32d26cf3d113554782d8699dd0f0c15 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 4 May 2021 06:34:54 +0000 Subject: 2021-05-04T06:30:01Z --- ag-ops.html | 46 ++++++++++------------------------------------ 1 file changed, 10 insertions(+), 36 deletions(-) (limited to 'ag-ops.html') diff --git a/ag-ops.html b/ag-ops.html index 7a25d2e01655..64f3de1d272e 100644 --- a/ag-ops.html +++ b/ag-ops.html @@ -42,51 +42,25 @@ 16
*** syncing ag-ops
- 17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
Already up to date.
 

-            18
discouraged. You can squelch this message by running one of the following
+            18
*** synced ag-ops
 

-            19
commands sometime before your next pull:
+            19
 * Sync succeeded
 

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

-            21
  git config pull.rebase false  # merge (the default strategy)
+            21
$ git show -q --pretty=format:%G? HEAD
 

-            22
  git config pull.rebase true   # rebase
+            22
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ag-ops
 

-            23
  git config pull.ff only       # fast-forward only
-

-            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
*** synced ag-ops
-

-            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 32 ag-ops
-

-            36
 * dev-lua/lgi-0.6.2: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            23
 * dev-lua/lgi-0.6.2: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            37
 * dev-lua/lgi-0.6.2-r1: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            24
 * dev-lua/lgi-0.6.2-r1: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            38
 * dev-lua/lgi-0.7.2: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
+            25
 * dev-lua/lgi-0.7.2: failed sourcing ebuild: flag-o-matic.eclass: EAPI 4 is too old., (flag-o-matic.eclass, line  14:  called die)
 
[FATAL]
-            39
 * Cache regen failed with 1
+            26
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad