Merge branch 'maint'

* maint: git-pull documentation: warn about the option order
git-mirror · Mar 11, 2008 · 1c53606 · 1c53606
2 parents 702088a + 92aeb99
commit 1c53606
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
@@ -21,6 +21,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
 -------