如何解决Pulling without specifying how to reconcile divergent branches

标签：his   ast   global   fast   如何   ref   gen   OWIN   you   

% git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Already up to date.

执行下面的配置，

% git config --global pull.ff only

如何解决Pulling without specifying how to reconcile divergent branches

标签：his   ast   global   fast   如何   ref   gen   OWIN   you   

原文地址：https://www.cnblogs.com/jiqing9006/p/14871417.html