diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-09-29 02:35:11 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-09-29 02:35:11 +0000 |
| commit | cf51af433e4029574a68192cf4befd000e46af2c (patch) | |
| tree | 2026a81c1d60d08404693324660ffa788e584d61 /slonko.txt | |
| parent | 2020-09-29T02:00:01Z (diff) | |
| download | repos-cf51af433e4029574a68192cf4befd000e46af2c.tar.gz repos-cf51af433e4029574a68192cf4befd000e46af2c.tar.bz2 repos-cf51af433e4029574a68192cf4befd000e46af2c.zip | |
2020-09-29T02: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 7b2e6174beb5..d55a62130074 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 |