diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-24 11:05:08 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-24 11:05:08 +0000 |
| commit | 64bf25a5f3f6b096bde765e1d956689d637a958a (patch) | |
| tree | 2382d6020390308a19687e699c90fc892916aa98 /fol4.txt | |
| parent | 2020-10-24T10:30:01Z (diff) | |
| download | repos-64bf25a5f3f6b096bde765e1d956689d637a958a.tar.gz repos-64bf25a5f3f6b096bde765e1d956689d637a958a.tar.bz2 repos-64bf25a5f3f6b096bde765e1d956689d637a958a.zip | |
2020-10-24T11:00:01Z
Diffstat (limited to 'fol4.txt')
| -rw-r--r-- | fol4.txt | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -7,10 +7,22 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.com/madsl/fol4'}, {'type': 'git', 'uri': 'git+ssh://git@gitlab.com/madsl/fol4.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync fol4 -Cloning into '/var/lib/repo-mirror-ci/sync/fol4'... +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. + warning: redirecting to https://gitlab.com/madsl/fol4.git/ +Already up to date. *** syncing fol4 *** synced fol4 * Sync succeeded |