From Forensic Tapir, 3 Months ago, written in Plain Text.
Embed
  1. warning: Pulling without specifying how to reconcile divergent branches is
  2. discouraged. You can squelch this message by running one of the following
  3. commands sometime before your next pull:
  4.  
  5.   git config pull.rebase false  # merge (the default strategy)
  6.   git config pull.rebase true   # rebase
  7.   git config pull.ff only       # fast-forward only
  8.  
  9. You can replace "git config" with "git config --global" to set a default
  10. preference for all repositories. You can also pass --rebase, --no-rebase,
  11. or --ff-only on the command line to override the configured default per
  12. invocation.
  13.