Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 179bdfc69ddfeff9d272ec309721e4098f3b051e..f7b90a326f8e244c2c9df286bb63afc655c67318 100644 (file)
--- 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
 -------