diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-18 10:18:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 10:18:43 -0700 |
| commit | 929c0975482e78c4bd680b010a8ceac6c31160a0 (patch) | |
| tree | d78188ab5394b7afe2ce0be0d26f678fc5427b4d /builtin/branch.c | |
| parent | Merge branch 'jl/zlib-restore-nul-termination' (diff) | |
| parent | Use hyphenated "remote-tracking branch" (docs and comments) (diff) | |
| download | tgif-929c0975482e78c4bd680b010a8ceac6c31160a0.tar.xz | |
Merge branch 'rd/doc-remote-tracking-with-hyphen'
Doc update.
* rd/doc-remote-tracking-with-hyphen:
Use hyphenated "remote-tracking branch" (docs and comments)
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index d53f6e2ad4..5217ba3bde 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -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) |