From e52cb7b016d5b36e8938657f6c9484cfbc8dc418 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 18:05:16 +0000 Subject: 2020-10-23T18:00:01Z --- Drauthius.txt | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'Drauthius.txt') diff --git a/Drauthius.txt b/Drauthius.txt index 40784134d54c..f378260b9718 100644 --- a/Drauthius.txt +++ b/Drauthius.txt @@ -13,9 +13,21 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/repo/user/Drauthius.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync Drauthius -Cloning into '/var/lib/repo-mirror-ci/sync/Drauthius'... +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 Drauthius *** synced Drauthius * Sync succeeded -- cgit v1.2.3-65-gdbad