警告内容
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.
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.
gitのバージョンアップデート後、ターミナルでgit pullすると、黄色い文字で上記のようにhintがたくさん出てくる
原因
複数ブランチがある状態で、ブランチを指定せずにpullしているから。
解決方法
以下のコマンドを打つことで、警告は表示されなくなる。
git config --global pull.ff only
ちなみに、git initでも同じようにhintがズラーと出てきた。それも以下のコマンドを打つことで警告は表示されなくなる。
git config --global init.defaultBranch master
参考文献
