diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-23 22:05:34 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-23 22:05:34 +0000 |
| commit | 3557306a83c5b9bb53fbff810705a8f98737adc4 (patch) | |
| tree | e266079bdf515756e5ba1a6826754e8bf847e9fd /brave-overlay.txt | |
| parent | 2021-03-23T21:45:01Z (diff) | |
| download | repos-3557306a83c5b9bb53fbff810705a8f98737adc4.tar.gz repos-3557306a83c5b9bb53fbff810705a8f98737adc4.tar.bz2 repos-3557306a83c5b9bb53fbff810705a8f98737adc4.zip | |
2021-03-23T22:00:01Z
Diffstat (limited to 'brave-overlay.txt')
| -rw-r--r-- | brave-overlay.txt | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/brave-overlay.txt b/brave-overlay.txt index d168790e56d0..2f235d94d926 100644 --- a/brave-overlay.txt +++ b/brave-overlay.txt @@ -9,12 +9,23 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.com/jason.oliveira/brave-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync brave-overlay 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: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). *** syncing brave-overlay -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. *** synced brave-overlay * Sync succeeded $ git log --format=%ci -1 |