diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-11-02 15:31:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-03 16:20:47 (GMT) |
| commit | 29b9a66f285f602ad67362ccbe2c6bfaac769f54 (patch) | |
| tree | 0947721dba3bcf5c73a69d6092bcb167a7041d33 /Documentation/git-describe.txt | |
| parent | 8b3f3f84b27e6bbac1b1558166b44431a8e78bb1 (diff) | |
| download | git-29b9a66f285f602ad67362ccbe2c6bfaac769f54.zip git-29b9a66f285f602ad67362ccbe2c6bfaac769f54.tar.gz git-29b9a66f285f602ad67362ccbe2c6bfaac769f54.tar.bz2 | |
Change incorrect uses of "remote branch" meaning "remote-tracking"
"remote branch" is a branch hosted in a remote repository, while
"remote-tracking branch" is a copy of such branch, hosted locally.
The distinction is subtle when the copy is up-to-date, but rather
fundamental to understand what "git fetch" and "git push" do.
This patch should fix all incorrect usages in Documentation/ directory.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-describe.txt')
| -rw-r--r-- | Documentation/git-describe.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index 7ef9d51..02e015a 100644 --- a/Documentation/git-describe.txt +++ b/Documentation/git-describe.txt @@ -37,7 +37,7 @@ OPTIONS --all:: Instead of using only the annotated tags, use any ref found in `.git/refs/`. This option enables matching - any known branch, remote branch, or lightweight tag. + any known branch, remote-tracking branch, or lightweight tag. --tags:: Instead of using only the annotated tags, use any tag |