diff options
Diffstat (limited to 'science.txt')
| -rw-r--r-- | science.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/science.txt b/science.txt index bc99d5ea261d..20527a6aeae5 100644 --- a/science.txt +++ b/science.txt @@ -26,6 +26,19 @@ {'type': 'git', 'uri': 'git@github.com:gentoo-science/sci.git'}], 'status': 'official'} $ pmaint sync science +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 science *** synced science |