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