diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-04 03:41:03 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-04 03:41:03 +0000 |
| commit | 356e41a8b0748023933b44c64e27df9791f2969f (patch) | |
| tree | 8c88b30378d8bbdda3b23dbd066aba7a8ee5f466 /hossie.txt | |
| parent | 2021-03-04T03:15:01Z (diff) | |
| download | repos-356e41a8b0748023933b44c64e27df9791f2969f.tar.gz repos-356e41a8b0748023933b44c64e27df9791f2969f.tar.bz2 repos-356e41a8b0748023933b44c64e27df9791f2969f.zip | |
2021-03-04T03:30:01Z
Diffstat (limited to 'hossie.txt')
| -rw-r--r-- | hossie.txt | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/hossie.txt b/hossie.txt index 52c3466f018b..dd758e751bdf 100644 --- a/hossie.txt +++ b/hossie.txt @@ -6,11 +6,21 @@ 'source': [{'type': 'git', 'uri': 'https://git.hossie.de/scm/gen/gentoo-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync hossie -WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:gitlab repo at '/var/lib/repo-mirror-ci/sync/gitlab', 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/hossie'... +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 hossie *** synced hossie * Sync succeeded |