Merge master into aw/mirror-push

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 818b720b914fa33d3a4b5c7858573bd59f0b0945..2e58481ed68b0cc8540b7126a9c5c389e3f67197 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -35,7 +35,7 @@ working tree.
 OPTIONS
 -------
 -q::
-       Quiet, supress feedback messages.
+       Quiet, suppress feedback messages.
 
 -f::
        Proceed even if the index or the working tree differs
@@ -50,7 +50,9 @@ OPTIONS
 --track::
        When -b is given and a branch is created off a remote branch,
        set up configuration so that git-pull will automatically
-       retrieve data from the remote branch.  Set the
+       retrieve data from the remote branch.  Use this if you always
+       pull from the same remote branch into the new branch, or if you
+       don't want to use "git pull <repository> <refspec>" explicitly.  Set the
        branch.autosetupmerge configuration variable to true if you
        want git-checkout and git-branch to always behave as if
        '--track' were given.