summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-05-02 00:34:52 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-05-02 00:34:52 +0000
commitde72c70fb2bc516d3dc0a8e7f714471e514cd0e9 (patch)
treeb1956396fe7aba7fc21b017743942e53d470a08e /dm9pZCAq.txt
parent2021-05-02T00:15:01Z (diff)
downloadrepos-de72c70fb2bc516d3dc0a8e7f714471e514cd0e9.tar.gz
repos-de72c70fb2bc516d3dc0a8e7f714471e514cd0e9.tar.bz2
repos-de72c70fb2bc516d3dc0a8e7f714471e514cd0e9.zip
2021-05-02T00:30:01Z
Diffstat (limited to 'dm9pZCAq.txt')
-rw-r--r--dm9pZCAq.txt16
1 files changed, 14 insertions, 2 deletions
diff --git a/dm9pZCAq.txt b/dm9pZCAq.txt
index bb385911357..76ebd513cf0 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