diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-31 13:22:18 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-31 13:22:18 +0000 |
| commit | 04e15158243ade6668007f9c8a07ae434fd707bb (patch) | |
| tree | 999b5e92e6730d8b6fee7b68bd948fed55db1039 /ahyangyi-overlay.txt | |
| parent | 2021-03-31T12:30:01Z (diff) | |
| download | repos-04e15158243ade6668007f9c8a07ae434fd707bb.tar.gz repos-04e15158243ade6668007f9c8a07ae434fd707bb.tar.bz2 repos-04e15158243ade6668007f9c8a07ae434fd707bb.zip | |
2021-03-31T13:15:01Z
Diffstat (limited to 'ahyangyi-overlay.txt')
| -rw-r--r-- | ahyangyi-overlay.txt | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/ahyangyi-overlay.txt b/ahyangyi-overlay.txt index b19a6b224cb4..0bb4fb14b51f 100644 --- a/ahyangyi-overlay.txt +++ b/ahyangyi-overlay.txt @@ -9,18 +9,22 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/ahyangyi/ahyangyi-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync ahyangyi-overlay -WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:2xsaiko repo at '/var/lib/repo-mirror-ci/sync/2xsaiko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:4nykey repo at '/var/lib/repo-mirror-ci/sync/4nykey', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:AlexandreFournier repo at '/var/lib/repo-mirror-ci/sync/AlexandreFournier', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:AzP repo at '/var/lib/repo-mirror-ci/sync/AzP', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:Case_Of repo at '/var/lib/repo-mirror-ci/sync/Case_Of', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:FireBurn repo at '/var/lib/repo-mirror-ci/sync/FireBurn', 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). *** syncing ahyangyi-overlay -Cloning into '/var/lib/repo-mirror-ci/sync/ahyangyi-overlay'... +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 ahyangyi-overlay * Sync succeeded $ git log --format=%ci -1 |