summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-02-26 23:36:53 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-02-26 23:36:53 +0000
commit46d8018421525fe28133cfe7e8ee94c44b9d9f5b (patch)
tree9b424e626ab4131d9ed290e52462438f12bd9b79 /quarks.txt
parent2021-02-26T23:15:01Z (diff)
downloadrepos-46d8018421525fe28133cfe7e8ee94c44b9d9f5b.tar.gz
repos-46d8018421525fe28133cfe7e8ee94c44b9d9f5b.tar.bz2
repos-46d8018421525fe28133cfe7e8ee94c44b9d9f5b.zip
2021-02-26T23:30:01Z
Diffstat (limited to 'quarks.txt')
-rw-r--r--quarks.txt16
1 files changed, 14 insertions, 2 deletions
diff --git a/quarks.txt b/quarks.txt
index 6ec35b55bd27..0607b4823ac8 100644
--- a/quarks.txt
+++ b/quarks.txt
@@ -9,9 +9,21 @@
'source': [{'type': 'git',
'uri': 'https://git.zero-downtime.net/quark/quarks.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync quarks
-Cloning into '/var/lib/repo-mirror-ci/sync/quarks'...
+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.
+
+Already up to date.
*** syncing quarks
*** synced quarks
* Sync succeeded