diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-09 00:47:10 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-09 00:47:10 +0000 |
| commit | dd65acd2d5c41ea8f1483b75809931dcd7b38b06 (patch) | |
| tree | 3db0e7711af3e4bd976535c2a035c5051d54b12f /tastytea.txt | |
| parent | 2021-02-08T21:30:01Z (diff) | |
| download | repos-dd65acd2d5c41ea8f1483b75809931dcd7b38b06.tar.gz repos-dd65acd2d5c41ea8f1483b75809931dcd7b38b06.tar.bz2 repos-dd65acd2d5c41ea8f1483b75809931dcd7b38b06.zip | |
2021-02-08T23:30:01Z
Diffstat (limited to 'tastytea.txt')
| -rw-r--r-- | tastytea.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tastytea.txt b/tastytea.txt index 9457da743d10..10b4e0ce3b45 100644 --- a/tastytea.txt +++ b/tastytea.txt @@ -8,9 +8,21 @@ 'source': [{'type': 'git', 'uri': 'https://schlomp.space/tastytea/overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync tastytea -Cloning into '/var/lib/repo-mirror-ci/sync/tastytea'... +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 tastytea *** synced tastytea * Sync succeeded |