diff options
Diffstat (limited to 'olifre.txt')
| -rw-r--r-- | olifre.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/olifre.txt b/olifre.txt index 1cc329fae634..50aa640ece6b 100644 --- a/olifre.txt +++ b/olifre.txt @@ -13,6 +13,19 @@ {'type': 'git', 'uri': 'git@github.com:olifre/olifre-portage.git'}], 'status': 'unofficial'} $ pmaint sync olifre +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 olifre *** synced olifre |