branch --track: code cleanup and saner handling of local branches

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 82929523c7166f9e5beb08689cef65cfa20c9a8c..818b720b914fa33d3a4b5c7858573bd59f0b0945 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -52,9 +52,8 @@ OPTIONS
        set up configuration so that git-pull will automatically
        retrieve data from the remote branch.  Set the
        branch.autosetupmerge configuration variable to true if you
-       want git-checkout and git-branch to behave as if
-       '--track' were given when you branch from a remote
-       tracking branch.
+       want git-checkout and git-branch to always behave as if
+       '--track' were given.
 
 --no-track::
        When -b is given and a branch is created off a remote branch,