Skip to content

Instantly share code, notes, and snippets.

@SunDi3yansyah
Created June 6, 2020 12:17
Show Gist options
  • Save SunDi3yansyah/fd28c71c8c34ef2e97f83edaee360b40 to your computer and use it in GitHub Desktop.
Save SunDi3yansyah/fd28c71c8c34ef2e97f83edaee360b40 to your computer and use it in GitHub Desktop.
[GIT PULL] Pulling without specifying how to reconcile divergent branches is discouraged

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment