summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-11 08:54:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-11 08:54:46 (GMT)
commit1c536069780bc67c05e621f0485f787d04559f24 (patch)
tree671a0f4b114d7fec8644a5e07d09ab355a654f85 /Documentation
parent702088afc680afef231d4a24bb5890f1d96a2cc9 (diff)
parent92aeb994d3195d3601df2e37052d60f9a6738b61 (diff)
downloadgit-1c536069780bc67c05e621f0485f787d04559f24.zip
git-1c536069780bc67c05e621f0485f787d04559f24.tar.gz
git-1c536069780bc67c05e621f0485f787d04559f24.tar.bz2
Merge branch 'maint'
* maint: git-pull documentation: warn about the option order
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-pull.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 7378943..3405ca0 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/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
-------