diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-03 16:35:08 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-03 16:35:08 +0000 |
| commit | bc398a2fadfbce01fefe44a8c171f332026bd2dd (patch) | |
| tree | d5e26ff149db6a249a8c56b8bbfa305249221dbd /myov.txt | |
| parent | 2021-01-03T16:00:01Z (diff) | |
| download | repos-bc398a2fadfbce01fefe44a8c171f332026bd2dd.tar.gz repos-bc398a2fadfbce01fefe44a8c171f332026bd2dd.tar.bz2 repos-bc398a2fadfbce01fefe44a8c171f332026bd2dd.zip | |
2021-01-03T16:30:01Z
Diffstat (limited to 'myov.txt')
| -rw-r--r-- | myov.txt | 15 |
1 files changed, 14 insertions, 1 deletions
@@ -8,7 +8,20 @@ {'type': 'git', 'uri': 'git+ssh://git@gitlab.com/xgqt/myov.git'}], 'status': 'unofficial'} $ pmaint sync myov -Cloning into '/var/lib/repo-mirror-ci/sync/myov'... +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 myov *** synced myov * Sync succeeded |