summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-10-21 14:35:10 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-10-21 14:35:10 +0000
commit9cb5f559d1c8c9f58ca425705b1f430cd745d92f (patch)
tree7a36646231317a7d0cc6b8af79c934df1169f497 /quarks.txt
parent2020-10-21T14:00:01Z (diff)
downloadrepos-9cb5f559d1c8c9f58ca425705b1f430cd745d92f.tar.gz
repos-9cb5f559d1c8c9f58ca425705b1f430cd745d92f.tar.bz2
repos-9cb5f559d1c8c9f58ca425705b1f430cd745d92f.zip
2020-10-21T14: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 eda282fd5189..a05a6d0686ad 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