diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-02 03:05:00 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-02 03:05:00 +0000 |
commit | a7d18cb0d62b6aeef9fa6a9587e566b10008e9e6 (patch) | |
tree | 2d8105b4336ff3319b64ebf7ef9870c979d5967a /phackerlay.txt | |
parent | 2021-01-02T02:30:01Z (diff) | |
download | repos-a7d18cb0d62b6aeef9fa6a9587e566b10008e9e6.tar.gz repos-a7d18cb0d62b6aeef9fa6a9587e566b10008e9e6.tar.bz2 repos-a7d18cb0d62b6aeef9fa6a9587e566b10008e9e6.zip |
2021-01-02T03:00:01Z
Diffstat (limited to 'phackerlay.txt')
-rw-r--r-- | phackerlay.txt | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/phackerlay.txt b/phackerlay.txt index 6ea1c803306e..5499bb7d3398 100644 --- a/phackerlay.txt +++ b/phackerlay.txt @@ -9,11 +9,21 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.phys-el.ru/ustinov/phackerlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync phackerlay -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -Cloning into '/var/lib/repo-mirror-ci/sync/phackerlay'... +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 phackerlay *** synced phackerlay * Sync succeeded |