Merge branch 'ss/faq-fetch-pull'

Random bits of FAQ.

* ss/faq-fetch-pull:
  gitfaq: fetching and pulling a repository

diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
index 11d9bac85901fe3cf36cf3f2f9cbba9468093cb9..370d62dae4e953f626843e9b82abca1647cd93d6 100644 (file)
--- a/Documentation/gitfaq.txt
+++ b/Documentation/gitfaq.txt
@@ -233,6 +233,14 @@ I asked Git to ignore various files, yet they are still tracked::
        and add a pattern to `.gitignore` that matches the <file>.
        See linkgit:gitignore[5] for details.
 
+[[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
 -----