summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-12-04 16:35:25 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-12-04 16:35:25 +0000
commit4e85f038b233582009951ba3f5edd6f3729a7a7d (patch)
treec914ddb47f29dca79791ab5fae30c6f72df27a2e /alxu.txt
parent2020-12-04T16:00:01Z (diff)
downloadrepos-4e85f038b233582009951ba3f5edd6f3729a7a7d.tar.gz
repos-4e85f038b233582009951ba3f5edd6f3729a7a7d.tar.bz2
repos-4e85f038b233582009951ba3f5edd6f3729a7a7d.zip
2020-12-04T16:30:01Z
Diffstat (limited to 'alxu.txt')
-rw-r--r--alxu.txt16
1 files changed, 14 insertions, 2 deletions
diff --git a/alxu.txt b/alxu.txt
index 11fa8030b3f8..b88aa88aa24c 100644
--- a/alxu.txt
+++ b/alxu.txt
@@ -8,9 +8,21 @@
'quality': 'experimental',
'source': [{'type': 'git', 'uri': 'https://git.alxu.ca/gentoo-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync alxu
-Cloning into '/var/lib/repo-mirror-ci/sync/alxu'...
+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 alxu
*** synced alxu
* Sync succeeded