
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
Reason for This
When from git repository for the first time you use the git pull
What you should use
Rather use git pull,
Use the git fetch
git fetch
git merge
Or
git pull --rebase=false