diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-20 09:37:03 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-02-20 09:37:03 +0000 |
| commit | bdc66da77de1a4bf6c19f3fb1995b93302af6f43 (patch) | |
| tree | 2af56f12fa43eb2c4eb2cd8b57b8e0f8d13a576e /src_prepare-overlay.txt | |
| parent | 2021-02-20T09:15:01Z (diff) | |
| download | repos-bdc66da77de1a4bf6c19f3fb1995b93302af6f43.tar.gz repos-bdc66da77de1a4bf6c19f3fb1995b93302af6f43.tar.bz2 repos-bdc66da77de1a4bf6c19f3fb1995b93302af6f43.zip | |
2021-02-20T09:30:01Z
Diffstat (limited to 'src_prepare-overlay.txt')
| -rw-r--r-- | src_prepare-overlay.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src_prepare-overlay.txt b/src_prepare-overlay.txt index d5afba3107fc..29b2917e2ad5 100644 --- a/src_prepare-overlay.txt +++ b/src_prepare-overlay.txt @@ -9,9 +9,21 @@ {'type': 'git', 'uri': 'git+ssh://git@gitlab.com/src_prepare/src_prepare-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync src_prepare-overlay -Cloning into '/var/lib/repo-mirror-ci/sync/src_prepare-overlay'... +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 src_prepare-overlay *** synced src_prepare-overlay * Sync succeeded |