diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-10 00:26:31 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-10 00:26:31 +0000 |
| commit | 85da855cc05d74e3ab58543fd124ef4a09e5a2fc (patch) | |
| tree | 58b5188ab13348cc9cfc7a0bef6637d25067ce41 /slonko.txt | |
| parent | 2021-02-09T22:00:02Z (diff) | |
| download | repos-85da855cc05d74e3ab58543fd124ef4a09e5a2fc.tar.gz repos-85da855cc05d74e3ab58543fd124ef4a09e5a2fc.tar.bz2 repos-85da855cc05d74e3ab58543fd124ef4a09e5a2fc.zip | |
2021-02-09T23:30:01Z
Diffstat (limited to 'slonko.txt')
| -rw-r--r-- | slonko.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/slonko.txt b/slonko.txt index cae6ef905137..383d8da19764 100644 --- a/slonko.txt +++ b/slonko.txt @@ -8,9 +8,21 @@ 'quality': 'experimental', 'source': [{'type': 'git', 'uri': 'https://slonko.net/git/portage'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync slonko -Cloning into '/var/lib/repo-mirror-ci/sync/slonko'... +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 slonko *** synced slonko * Sync succeeded |