summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'awesome.txt')
-rw-r--r--awesome.txt22
1 files changed, 2 insertions, 20 deletions
diff --git a/awesome.txt b/awesome.txt
index 8dfa42489731..d327febe4d58 100644
--- a/awesome.txt
+++ b/awesome.txt
@@ -8,28 +8,10 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.awesome-it.de/overlays/awesome.git'}],
'status': 'unofficial'}
-$ pmaint sync awesome
-warning: Pulling without specifying how to reconcile divergent branches is
-discouraged. You can squelch this message by running one of the following
-commands sometime before your next pull:
-
- git config pull.rebase false # merge (the default strategy)
- git config pull.rebase true # rebase
- git config pull.ff only # fast-forward only
-
-You can replace "git config" with "git config --global" to set a default
-preference for all repositories. You can also pass --rebase, --no-rebase,
-or --ff-only on the command line to override the configured default per
-invocation.
-
-fatal: unable to access 'https://gitlab.awesome-it.de/overlays/awesome.git/': The requested URL returned error: 502
-*** syncing awesome
-!!! failed syncing awesome
- * Sync failed with 1
- * Will try to re-create
+ * Adding new repository
$ pmaint sync awesome
Cloning into '/var/lib/repo-mirror-ci/sync/awesome'...
fatal: unable to access 'https://gitlab.awesome-it.de/overlays/awesome.git/': The requested URL returned error: 502
*** syncing awesome
!!! failed syncing awesome
- * Sync failed again with 1, removing
+ * Sync failed with 1