diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-15 12:52:37 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-15 12:52:37 +0000 |
| commit | 127f2341f815bd645041bf37523fd8619c8b1425 (patch) | |
| tree | 9d56864504cab8c7da327b1efd7e7e8b8bf7f5c0 /brave-overlay.txt | |
| parent | 2021-03-15T12:30:01Z (diff) | |
| download | repos-127f2341f815bd645041bf37523fd8619c8b1425.tar.gz repos-127f2341f815bd645041bf37523fd8619c8b1425.tar.bz2 repos-127f2341f815bd645041bf37523fd8619c8b1425.zip | |
2021-03-15T12:45:01Z
Diffstat (limited to 'brave-overlay.txt')
| -rw-r--r-- | brave-overlay.txt | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/brave-overlay.txt b/brave-overlay.txt index c915616b9e2b..979a7ad9c8c1 100644 --- a/brave-overlay.txt +++ b/brave-overlay.txt @@ -9,18 +9,22 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.com/jason.oliveira/brave-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync brave-overlay -WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:ag-ops repo at '/var/lib/repo-mirror-ci/sync/ag-ops', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:ag-ops repo at '/var/lib/repo-mirror-ci/sync/ag-ops', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', 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/brave-overlay'... +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 brave-overlay *** synced brave-overlay * Sync succeeded |