mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'maint'
* maint: git-pull documentation: warn about the option order
This commit is contained in:
commit
1c53606978
|
@ -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
|
||||
-------
|
||||
|
|
Loading…
Reference in a new issue