diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-27 18:05:21 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-27 18:05:21 +0000 |
| commit | 70101cfdcf1c407fd291e161c65820b8ae035d86 (patch) | |
| tree | feb2daf00678795a9256fb5a497abd104c9e338f /HomeAssistantRepository.txt | |
| parent | 2020-11-27T17:30:01Z (diff) | |
| download | repos-70101cfdcf1c407fd291e161c65820b8ae035d86.tar.gz repos-70101cfdcf1c407fd291e161c65820b8ae035d86.tar.bz2 repos-70101cfdcf1c407fd291e161c65820b8ae035d86.zip | |
2020-11-27T18:00:01Z
Diffstat (limited to 'HomeAssistantRepository.txt')
| -rw-r--r-- | HomeAssistantRepository.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/HomeAssistantRepository.txt b/HomeAssistantRepository.txt index 52ae589c804e..a08bcd2d8a37 100644 --- a/HomeAssistantRepository.txt +++ b/HomeAssistantRepository.txt @@ -11,9 +11,21 @@ {'type': 'git', 'uri': 'https://github.com/onkelbeh/HomeAssistantRepository.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync 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. *** syncing HomeAssistantRepository *** synced HomeAssistantRepository * Sync succeeded |