diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 18:05:16 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 18:05:16 +0000 |
| commit | e52cb7b016d5b36e8938657f6c9484cfbc8dc418 (patch) | |
| tree | 15d68e1a591e0bf4c27fa5f40da6842355322791 /activehome.txt | |
| parent | 2020-10-23T17:30:01Z (diff) | |
| download | repos-e52cb7b016d5b36e8938657f6c9484cfbc8dc418.tar.gz repos-e52cb7b016d5b36e8938657f6c9484cfbc8dc418.tar.bz2 repos-e52cb7b016d5b36e8938657f6c9484cfbc8dc418.zip | |
2020-10-23T18:00:01Z
Diffstat (limited to 'activehome.txt')
| -rw-r--r-- | activehome.txt | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/activehome.txt b/activehome.txt index d51a9852ab0a..2c6036c68eb9 100644 --- a/activehome.txt +++ b/activehome.txt @@ -16,12 +16,21 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/user/activehome.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync activehome -WARNING:pkgcore:AstroFloyd repo at '/var/lib/repo-mirror-ci/sync/AstroFloyd', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:Drauthius repo at '/var/lib/repo-mirror-ci/sync/Drauthius', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:DuPol repo at '/var/lib/repo-mirror-ci/sync/DuPol', 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/activehome'... +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 activehome *** synced activehome * Sync succeeded |