summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-03-13 21:35:58 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-03-13 21:35:58 +0000
commit239e3bbb567304c4b103cc14243e69743aab9d21 (patch)
treec1d37b375c1b79633f85c0b7751bc17bfa36738a /hotstoast.txt
parent2021-03-13T21:15:01Z (diff)
downloadrepos-239e3bbb567304c4b103cc14243e69743aab9d21.tar.gz
repos-239e3bbb567304c4b103cc14243e69743aab9d21.tar.bz2
repos-239e3bbb567304c4b103cc14243e69743aab9d21.zip
2021-03-13T21:30:01Z
Diffstat (limited to 'hotstoast.txt')
-rw-r--r--hotstoast.txt17
1 files changed, 14 insertions, 3 deletions
diff --git a/hotstoast.txt b/hotstoast.txt
index c2f2284c79d8..97cf82476d86 100644
--- a/hotstoast.txt
+++ b/hotstoast.txt
@@ -11,10 +11,21 @@
{'type': 'git',
'uri': 'git+ssh://git@github.com/TomHotston/hotstoast-overlay.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync hotstoast
-WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
-Cloning into '/var/lib/repo-mirror-ci/sync/hotstoast'...
+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 hotstoast
*** synced hotstoast
* Sync succeeded