gitfaq: fetching and pulling a repository

Add an issue in 'Common Issues' section which addresses the confusion
between performing a 'fetch' and a 'pull'.

Helped-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
index 1cf83df118a52374562c397857e5e010a6a0a48c..1846d90f94d2b2abfcfd92828ec9167dfa51a1f1 100644 (file)
--- a/Documentation/gitfaq.txt
+++ b/Documentation/gitfaq.txt
@@ -223,6 +223,14 @@ a file checked into the repository which is a template or set of defaults which
 can then be copied alongside and modified as appropriate.  This second, modified
 file is usually ignored to prevent accidentally committing it.
 
+[[fetching-and-pulling]]
+How do I know if I want to do a fetch or a pull?::
+       A fetch stores a copy of the latest changes from the remote
+       repository, without modifying the working tree or current branch.
+       You can then at your leisure inspect, merge, rebase on top of, or
+       ignore the upstream changes.  A pull consists of a fetch followed
+       immediately by either a merge or rebase.  See linkgit:git-pull[1].
+
 Hooks
 -----