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

Doc update.

* rd/doc-remote-tracking-with-hyphen:
  Use hyphenated "remote-tracking branch" (docs and comments)
This commit is contained in:
Junio C Hamano
2018-06-18 10:18:43 -07:00
3 changed files with 5 additions and 5 deletions

View File

@ -701,7 +701,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
* If no sorting parameter is given then we default to sorting
* by 'refname'. This would give us an alphabetically sorted
* array with the 'HEAD' ref at the beginning followed by
* local branches 'refs/heads/...' and finally remote-tacking
* local branches 'refs/heads/...' and finally remote-tracking
* branches 'refs/remotes/...'.
*/
if (!sorting)