diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-02 05:20:21 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-02 05:20:21 +0000 |
| commit | 52dc6aee9ae2aa3650b81a2415d1802a7e632551 (patch) | |
| tree | 9139d425a2623b0ce0333825a195b28cff277d8c /lanodanOverlay.txt | |
| parent | 2021-04-02T05:00:01Z (diff) | |
| download | repos-52dc6aee9ae2aa3650b81a2415d1802a7e632551.tar.gz repos-52dc6aee9ae2aa3650b81a2415d1802a7e632551.tar.bz2 repos-52dc6aee9ae2aa3650b81a2415d1802a7e632551.zip | |
2021-04-02T05:15:01Z
Diffstat (limited to 'lanodanOverlay.txt')
| -rw-r--r-- | lanodanOverlay.txt | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lanodanOverlay.txt b/lanodanOverlay.txt index 58495d1b6705..e1a85b57ef87 100644 --- a/lanodanOverlay.txt +++ b/lanodanOverlay.txt @@ -14,12 +14,23 @@ {'type': 'git', 'uri': 'git://hacktivis.me/git/overlay.git'}, {'type': 'git', 'uri': 'git://gitlab.com/lanodan/overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync lanodanOverlay WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing lanodanOverlay -Cloning into '/var/lib/repo-mirror-ci/sync/lanodanOverlay'... +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 lanodanOverlay * Sync succeeded $ git log --format=%ci -1 |