diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-01 13:47:25 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-01 13:47:25 +0000 |
| commit | f0d77f2ddc732025f48952dbf2daaac6dad87ce7 (patch) | |
| tree | 3d72a338aa052e8ed4c6fa4047a726526437e386 /ext-devlibs.txt | |
| parent | 2021-02-01T11:00:01Z (diff) | |
| download | repos-f0d77f2ddc732025f48952dbf2daaac6dad87ce7.tar.gz repos-f0d77f2ddc732025f48952dbf2daaac6dad87ce7.tar.bz2 repos-f0d77f2ddc732025f48952dbf2daaac6dad87ce7.zip | |
2021-02-01T12:30:01Z
Diffstat (limited to 'ext-devlibs.txt')
| -rw-r--r-- | ext-devlibs.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ext-devlibs.txt b/ext-devlibs.txt index be9ba43e994c..846680ea0d74 100644 --- a/ext-devlibs.txt +++ b/ext-devlibs.txt @@ -11,9 +11,21 @@ {'type': 'git', 'uri': 'git@gitlab.com:extsidvind/ext-devlibs.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync ext-devlibs -Cloning into '/var/lib/repo-mirror-ci/sync/ext-devlibs'... +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 ext-devlibs *** synced ext-devlibs * Sync succeeded |