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