From 481d65bceeee28d9004bf1e3589eb06d58b9f854 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 3 May 2021 00:34:53 +0000 Subject: 2021-05-03T00:30:01Z --- dm9pZCAq.txt | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'dm9pZCAq.txt') diff --git a/dm9pZCAq.txt b/dm9pZCAq.txt index bb385911357f..76ebd513cf0d 100644 --- a/dm9pZCAq.txt +++ b/dm9pZCAq.txt @@ -9,10 +9,22 @@ 'status': 'unofficial'} pkgcore 0.11.2 -- extended version info unavailable - * Adding new repository $ pmaint sync dm9pZCAq *** syncing dm9pZCAq -Cloning into '/var/lib/repo-mirror-ci/sync/dm9pZCAq'... +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 dm9pZCAq * Sync succeeded $ git log --format=%ci -1 -- cgit v1.2.3