Merge branch 'ms/remote-tracking-branches-in-doc'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Jul 2013 19:04:07 +0000 (12:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Jul 2013 19:04:07 +0000 (12:04 -0700)
commit778e4b890390e90e19b7f835f3b0ffe92e8d5345
treee93c198c3c051a4ce8320f83abd0d11310b10b30
parent5b307e95e880b95eafd36e93251c6638c222dcf4
parentd6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5
Merge branch 'ms/remote-tracking-branches-in-doc'

* ms/remote-tracking-branches-in-doc:
  Change "remote tracking" to "remote-tracking"
builtin/clone.c
builtin/merge.c
t/t5505-remote.sh