Merge branch 'ph/maint-quiltimport' into maint

[git.git] / Documentation / git-pull.txt

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 4cc633a5ec4c449e98ac9cb16fd125da6d336798..f7b90a326f8e244c2c9df286bb63afc655c67318 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -20,6 +20,8 @@ Note that you can use `.` (current directory) as the
 <repository> to pull from the local repository -- this is useful
 when merging local branches into the current branch.
 
+Also note that options meant for `git-pull` itself and underlying
+`git-merge` must be given before the options meant for `git-fetch`.
 
 OPTIONS
 -------
@@ -39,11 +41,11 @@ include::merge-strategies.txt[]
        there is a remote ref for the upstream branch, and this branch
        was rebased since last fetched, the rebase uses that information
        to avoid rebasing non-local changes.
-
-       *NOTE:* This is a potentially _dangerous_ mode of operation.
-       It rewrites history, which does not bode well when you
-       published that history already.  Do *not* use this option
-       unless you have read linkgit:git-rebase[1] carefully.
++
+*NOTE:* This is a potentially _dangerous_ mode of operation.
+It rewrites history, which does not bode well when you
+published that history already.  Do *not* use this option
+unless you have read linkgit:git-rebase[1] carefully.
 
 \--no-rebase::
        Override earlier \--rebase.