From 3f0a3209324f94eea02d615bdd9758825320c024 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 31 Mar 2021 09:16:51 +0000 Subject: 2021-03-31T09:15:01Z --- alesharik.html | 44 +++++++------------------------------------- 1 file changed, 7 insertions(+), 37 deletions(-) (limited to 'alesharik.html') diff --git a/alesharik.html b/alesharik.html index 16bb6456c4aa..dc5f73566a72 100644 --- a/alesharik.html +++ b/alesharik.html @@ -36,47 +36,17 @@ 13
$ pmaint sync alesharik
- 14
*** syncing alesharik
+            14
pmaint sync: error: argument repo: couldn't find repo 'alesharik' (available: gentoo:/usr/portage)
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
 * Sync failed with 2
+
[FATAL]
+            16
 * Will try to re-create
 

-            16
discouraged. You can squelch this message by running one of the following
+            17
$ pmaint sync alesharik
 

-            17
commands sometime before your next pull:
+            18
pmaint sync: error: argument repo: couldn't find repo 'alesharik' (available: gentoo:/usr/portage)
 

-            18
-

-            19
  git config pull.rebase false  # merge (the default strategy)
-

-            20
  git config pull.rebase true   # rebase
-

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

-            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
*** synced alesharik
-

-            30
 * Sync succeeded
-

-            31
$ git log --format=%ci -1
-

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

-            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 alesharik
-

-            34
 * Cache regenerated successfully
+            19
 * Sync failed again with 2, removing
 

 
         
-- 
cgit v1.2.3-65-gdbad