diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-05 13:05:11 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-05 13:05:11 +0000 |
| commit | 1d962da949d883af3e82bf30df3bd010f40543fa (patch) | |
| tree | 26c3ac302222d84015e29c70ca225873b0b52022 /2xsaiko.txt | |
| parent | 2020-11-05T12:30:02Z (diff) | |
| download | repos-1d962da949d883af3e82bf30df3bd010f40543fa.tar.gz repos-1d962da949d883af3e82bf30df3bd010f40543fa.tar.bz2 repos-1d962da949d883af3e82bf30df3bd010f40543fa.zip | |
2020-11-05T13:00:01Z
Diffstat (limited to '2xsaiko.txt')
| -rw-r--r-- | 2xsaiko.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/2xsaiko.txt b/2xsaiko.txt index 8ffdf556ce36..f61fdaab2235 100644 --- a/2xsaiko.txt +++ b/2xsaiko.txt @@ -9,9 +9,21 @@ 'source': [{'type': 'git', 'uri': 'https://git.sr.ht/~dblsaiko/ebuilds'}, {'type': 'git', 'uri': 'git@git.sr.ht:~dblsaiko/ebuilds'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync 2xsaiko -Cloning into '/var/lib/repo-mirror-ci/sync/2xsaiko'... +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 2xsaiko *** synced 2xsaiko * Sync succeeded |