git-pull documentation: warn about the option order
We might eventually be loosening this rule, but there is a longstanding restriction that the users currently need to be aware of. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 10, 2008 at 01:22 UTC
5b10a3c12439b262ccebb528a2db3945e7ebd061
1 file changed
+2
Documentation/git-pull.txt
+2
@@ -20,6 +20,8 @@ Note that you can use `.` (current directory) as the
20
<repository> to pull from the local repository -- this is useful
21
when merging local branches into the current branch.
22
23
+Also note that options meant for `git-pull` itself and underlying
24
+`git-merge` must be given before the options meant for `git-fetch`.
25
26
OPTIONS
27
-------