diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-03-11 22:50:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-03-11 22:50:03 +0000 |
| commit | 0578b22ff8cda5310219423fe1d6255c903710e1 (patch) | |
| tree | 0020ad714b2c535a3c2634b2bd045344bd98a7ba /git-pull.txt | |
| parent | bb34317b8b0b3c34f91f17697ad618fe19148f7b (diff) | |
| download | git-htmldocs-0578b22ff8cda5310219423fe1d6255c903710e1.tar.gz | |
Autogenerated HTML docs for v1.5.4.4-498-g5d92
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-pull.txt b/git-pull.txt index 737894390..3405ca09e 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -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 ------- |