diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-22 01:05:21 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-22 01:05:21 +0000 |
| commit | 84701469098e0b640cee3db7b181d1c422010aae (patch) | |
| tree | ec11dee6710c3d6a2d3ea0324dd460d5fd57a65e /dm9pZCAq.txt | |
| parent | 2020-11-22T00:30:01Z (diff) | |
| download | repos-84701469098e0b640cee3db7b181d1c422010aae.tar.gz repos-84701469098e0b640cee3db7b181d1c422010aae.tar.bz2 repos-84701469098e0b640cee3db7b181d1c422010aae.zip | |
2020-11-22T01:00:01Z
Diffstat (limited to 'dm9pZCAq.txt')
| -rw-r--r-- | dm9pZCAq.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/dm9pZCAq.txt b/dm9pZCAq.txt index 0b7c0de1145a..abf3bac092de 100644 --- a/dm9pZCAq.txt +++ b/dm9pZCAq.txt @@ -7,9 +7,21 @@ 'source': [{'type': 'git', 'uri': 'https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync dm9pZCAq -Cloning into '/var/lib/repo-mirror-ci/sync/dm9pZCAq'... +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 dm9pZCAq *** synced dm9pZCAq * Sync succeeded |