diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-13 06:05:04 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-13 06:05:04 +0000 |
| commit | 87783790f49b0d1d18743982bbaa7f289bc29b6f (patch) | |
| tree | 4bdc043b066c4ed4a6bfda2be06d485204402701 /flewkey-overlay.txt | |
| parent | 2020-10-13T05:30:01Z (diff) | |
| download | repos-87783790f49b0d1d18743982bbaa7f289bc29b6f.tar.gz repos-87783790f49b0d1d18743982bbaa7f289bc29b6f.tar.bz2 repos-87783790f49b0d1d18743982bbaa7f289bc29b6f.zip | |
2020-10-13T06:00:01Z
Diffstat (limited to 'flewkey-overlay.txt')
| -rw-r--r-- | flewkey-overlay.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/flewkey-overlay.txt b/flewkey-overlay.txt index d3248b8e4f19..815a9eb3f1c6 100644 --- a/flewkey-overlay.txt +++ b/flewkey-overlay.txt @@ -8,9 +8,21 @@ 'source': [{'type': 'git', 'uri': 'https://git.sdf.org/flewkey/flewkey-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync flewkey-overlay -Cloning into '/var/lib/repo-mirror-ci/sync/flewkey-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 flewkey-overlay *** synced flewkey-overlay * Sync succeeded |