diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-10 01:22:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-10 01:22:03 -0700 |
| commit | 5b10a3c12439b262ccebb528a2db3945e7ebd061 (patch) | |
| tree | ace38553a9f2aa9ca0c99e1fa272dae36798b835 /Documentation/git-pull.txt | |
| parent | 56d5fe285583b5177ffc65dbe7df636ed5b8cc6b (diff) | |
| download | git-5b10a3c12439b262ccebb528a2db3945e7ebd061.tar.gz git-5b10a3c12439b262ccebb528a2db3945e7ebd061.tar.xz | |
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 <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 2 |
1 files changed, 2 insertions, 0 deletions
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 <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 ------- |