summaryrefslogtreecommitdiffstats
path: root/git-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-11-13 08:21:11 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-11-13 08:21:11 +0000
commit14aca6e3dcbe193374c3203aeebfe7d1c52d7963 (patch)
treea52ab6062a52228c6f7dee2e5475d73fd4ae6d38 /git-branch.txt
parent3cc173935a05b023988ba62249612830966dafa1 (diff)
downloadgit-htmldocs-14aca6e3dcbe193374c3203aeebfe7d1c52d7963.tar.gz
Autogenerated HTML docs for v1.5.3.5-652-gf192c
Diffstat (limited to 'git-branch.txt')
-rw-r--r--git-branch.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-branch.txt b/git-branch.txt
index 5e81aa4ee..5ce905de8 100644
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -105,7 +105,7 @@ OPTIONS
'--track' were given.
--no-track::
- When -b is given and a branch is created off a remote branch,
+ When a branch is created off a remote branch,
set up configuration so that git-pull will not retrieve data
from the remote branch, ignoring the branch.autosetupmerge
configuration variable.