mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 02:23:54 +01:00
Code

Merge branch 'maint'

Browse Source 
* maint:
  git-pull documentation: warn about the option order
This commit is contained in:
Junio C Hamano 2008-03-11 01:54:46 -07:00
commit 1c53606978
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-pull.txt
View File

@ -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
-------