diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2010-11-02 16:31:24 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-11-03 09:20:47 -0700 |
| commit | 29b9a66f285f602ad67362ccbe2c6bfaac769f54 (patch) | |
| tree | 0947721dba3bcf5c73a69d6092bcb167a7041d33 /builtin/merge.c | |
| parent | Change "tracking branch" to "remote-tracking branch" (diff) | |
| download | tgif-29b9a66f285f602ad67362ccbe2c6bfaac769f54.tar.xz | |
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 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions