Merge branch 'rd/doc-remote-tracking-with-hyphen'

Doc update.

* rd/doc-remote-tracking-with-hyphen:
Use hyphenated "remote-tracking branch" (docs and comments)

diff --cc Documentation/git-submodule.txt
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/pull.c
Simple merge