diff options
Diffstat (limited to 'blender-gentoo-logo.txt')
| -rw-r--r-- | blender-gentoo-logo.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/blender-gentoo-logo.txt b/blender-gentoo-logo.txt index 4ae057c7b64a..0c182c8d9411 100644 --- a/blender-gentoo-logo.txt +++ b/blender-gentoo-logo.txt @@ -12,9 +12,21 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/repo/proj/blender-gentoo-logo.git'}], 'status': 'official'} - * Adding new repository $ pmaint sync blender-gentoo-logo -Cloning into '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo'... +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 blender-gentoo-logo *** synced blender-gentoo-logo * Sync succeeded |