diff options
Diffstat (limited to 'simonvanderveldt.txt')
| -rw-r--r-- | simonvanderveldt.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/simonvanderveldt.txt b/simonvanderveldt.txt index fc67d6e8f13a..2fb6feefa060 100644 --- a/simonvanderveldt.txt +++ b/simonvanderveldt.txt @@ -15,6 +15,19 @@ 'uri': 'git@github.com:simonvanderveldt/simonvanderveldt-overlay.git'}], 'status': 'unofficial'} $ pmaint sync simonvanderveldt +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 simonvanderveldt *** synced simonvanderveldt |