Merge branch 'cb/open-noatime-clear-errno' into maint

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 712ab4baed2c6802ddd96681f11c7f05a436f48b..93c72a29cecb7ce005dc579e79c5e5bacaaac420 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -74,9 +74,6 @@ pulling or stash them away with linkgit:git-stash[1].
 OPTIONS
 -------
 
-Options meant for 'git pull' itself and the underlying 'git merge'
-must be given before the options meant for 'git fetch'.
-
 -q::
 --quiet::
        This is passed to both underlying git-fetch to squelch reporting of