Gitの警告 [ You have divergent branches and need to specify how to reconcile them]

git pull -aすると、下記のようなエラーが怒られてしまう。

service]$ git branch
* develop
service]$ git pull -a
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint:   git config pull.rebase false  # merge
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.

解決方法

[config]を用いて、[pull.rebase], [pull.ff]のいずれかの設定を明確化する。
pullをする毎にオプションをちゃんと指定する。　ちょっと怖いですので、下記のように実施すると、問題を解消できる。

service]$ git fetch --all
service]$ git checkout develop
service]$ git pull origin develop