diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-12-14 01:04:59 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-12-14 01:04:59 +0000 |
| commit | 3c54d71b693b4164b34247104d0e5e436ac77e9c (patch) | |
| tree | d98dffce666532bf99b923ab9ae54760f03accb4 /goduck777.txt | |
| parent | 2020-12-14T00:30:01Z (diff) | |
| download | repos-3c54d71b693b4164b34247104d0e5e436ac77e9c.tar.gz repos-3c54d71b693b4164b34247104d0e5e436ac77e9c.tar.bz2 repos-3c54d71b693b4164b34247104d0e5e436ac77e9c.zip | |
2020-12-14T01:00:01Z
Diffstat (limited to 'goduck777.txt')
| -rw-r--r-- | goduck777.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/goduck777.txt b/goduck777.txt index 806dc13afc4a..87c497bae5f2 100644 --- a/goduck777.txt +++ b/goduck777.txt @@ -13,9 +13,21 @@ {'type': 'git', 'uri': 'git@github.com:goduck777/gentoo-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync goduck777 -Cloning into '/var/lib/repo-mirror-ci/sync/goduck777'... +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 goduck777 *** synced goduck777 * Sync succeeded |