diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-11 04:04:58 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-11 04:04:58 +0000 |
| commit | eee2e3890b7e9f2edb4210aceb510be4f9d2a85f (patch) | |
| tree | 684ee3ce6e28767aea1765c1aaa7f68fd7cbcfda /foxiverlay.txt | |
| parent | 2020-10-11T03:30:01Z (diff) | |
| download | repos-eee2e3890b7e9f2edb4210aceb510be4f9d2a85f.tar.gz repos-eee2e3890b7e9f2edb4210aceb510be4f9d2a85f.tar.bz2 repos-eee2e3890b7e9f2edb4210aceb510be4f9d2a85f.zip | |
2020-10-11T04:00:01Z
Diffstat (limited to 'foxiverlay.txt')
| -rw-r--r-- | foxiverlay.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/foxiverlay.txt b/foxiverlay.txt index ad7bf04d1ff7..a2919311f25d 100644 --- a/foxiverlay.txt +++ b/foxiverlay.txt @@ -10,9 +10,21 @@ {'type': 'git', 'uri': 'git://github.com/Pekkari/foxiverlay.git'}, {'type': 'git', 'uri': 'git@github.com:Pekkari/foxiverlay.git'}], 'status': 'unofficial'} - * Resetting, sync parameters changed $ pmaint sync foxiverlay -Cloning into '/var/lib/repo-mirror-ci/sync/foxiverlay'... +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 foxiverlay *** synced foxiverlay * Sync succeeded |