Skip to content

Commit

Permalink
git-pull documentation: warn about the option order
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Mar 10, 2008
1 parent 56d5fe2 commit 5b10a3c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Documentation/git-pull.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------
Expand Down

0 comments on commit 5b10a3c

Please sign in to comment.