summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-05-02 09:04:58 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-05-02 09:04:58 +0000
commiteab2968279da030d07e7f02d0aafc7f02335cf0e (patch)
treef377785e22e8a08100bcead53ed10caa8643fd09 /HomeAssistantRepository.txt
parent2021-05-02T08:45:01Z (diff)
downloadrepos-eab2968279da030d07e7f02d0aafc7f02335cf0e.tar.gz
repos-eab2968279da030d07e7f02d0aafc7f02335cf0e.tar.bz2
repos-eab2968279da030d07e7f02d0aafc7f02335cf0e.zip
2021-05-02T09:00:01Z
Diffstat (limited to 'HomeAssistantRepository.txt')
-rw-r--r--HomeAssistantRepository.txt16
1 files changed, 14 insertions, 2 deletions
diff --git a/HomeAssistantRepository.txt b/HomeAssistantRepository.txt
index 697c8ab4162..c0d4b313f52 100644
--- a/HomeAssistantRepository.txt
+++ b/HomeAssistantRepository.txt
@@ -13,10 +13,22 @@
'status': 'unofficial'}
pkgcore 0.11.2 -- extended version info unavailable
- * Adding new repository
$ pmaint sync HomeAssistantRepository
*** syncing HomeAssistantRepository
-Cloning into '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository'...
+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 HomeAssistantRepository
* Sync succeeded
$ git log --format=%ci -1