From bf0bf4098cf2473ec7b4b1196e207693b2636d82 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 30 Oct 2020 11:05:10 +0000 Subject: 2020-10-30T11:00:01Z --- brave-overlay.txt | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'brave-overlay.txt') diff --git a/brave-overlay.txt b/brave-overlay.txt index 37191faf7bd6..533dc2e9d846 100644 --- a/brave-overlay.txt +++ b/brave-overlay.txt @@ -9,9 +9,21 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.com/jason.oliveira/brave-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync 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. *** syncing brave-overlay *** synced brave-overlay * Sync succeeded -- cgit v1.2.3-65-gdbad