diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-09 07:50:42 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-09 07:50:42 +0000 |
| commit | 2c0e1d1ec9a227834c21adeac5d60b3b66e3f230 (patch) | |
| tree | e2ca214154e1f4b2ddde578ce98293f481bc710f /0bs1d1an.txt | |
| parent | 2021-03-09T07:30:01Z (diff) | |
| download | repos-2c0e1d1ec9a227834c21adeac5d60b3b66e3f230.tar.gz repos-2c0e1d1ec9a227834c21adeac5d60b3b66e3f230.tar.bz2 repos-2c0e1d1ec9a227834c21adeac5d60b3b66e3f230.zip | |
2021-03-09T07:45:01Z
Diffstat (limited to '0bs1d1an.txt')
| -rw-r--r-- | 0bs1d1an.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/0bs1d1an.txt b/0bs1d1an.txt index 17461b6cd08b..843dfe1cd77c 100644 --- a/0bs1d1an.txt +++ b/0bs1d1an.txt @@ -11,9 +11,21 @@ {'type': 'git', 'uri': 'git+ssh://git@gitlab.com/0bs1d1an/0bs1d1an-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync 0bs1d1an -Cloning into '/var/lib/repo-mirror-ci/sync/0bs1d1an'... +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 0bs1d1an *** synced 0bs1d1an * Sync succeeded |