From 5b10a3c12439b262ccebb528a2db3945e7ebd061 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 10 Mar 2008 01:22:03 -0700 Subject: 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 --- Documentation/git-pull.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 179bdfc69..f7b90a326 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -20,6 +20,8 @@ Note that you can use `.` (current directory) as the 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 ------- -- cgit v1.2.1