diff options
author | 2020-08-16 22:05:25 +0000 | |
---|---|---|
committer | 2020-08-16 22:05:25 +0000 | |
commit | 96563afc5f9fb8bf8625cf0da1de2c03bf349cd5 (patch) | |
tree | ac6c4399e291938165912c920f6f27b0cb33a3cc /slonko.txt | |
parent | 2020-08-16T21:30:01Z (diff) | |
download | repos-96563afc5f9fb8bf8625cf0da1de2c03bf349cd5.tar.gz repos-96563afc5f9fb8bf8625cf0da1de2c03bf349cd5.tar.bz2 repos-96563afc5f9fb8bf8625cf0da1de2c03bf349cd5.zip |
2020-08-16T22:00: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 |