Merge branch 'ss/faq-fetch-pull'

Random bits of FAQ.

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

diff --cc Documentation/gitfaq.txt
index 11d9bac85901fe3cf36cf3f2f9cbba9468093cb9,1846d90f94d2b2abfcfd92828ec9167dfa51a1f1..370d62dae4e953f626843e9b82abca1647cd93d6
--- 1/Documentation/gitfaq.txt
--- 2/Documentation/gitfaq.txt
+++ b/Documentation/gitfaq.txt
@@@ -223,16 -223,14 +223,24 @@@ a file checked into the repository whic
  can then be copied alongside and modified as appropriate.  This second, modified
  file is usually ignored to prevent accidentally committing it.
  
 +[[files-in-.gitignore-are-tracked]]
 +I asked Git to ignore various files, yet they are still tracked::
 +      A `gitignore` file ensures that certain file(s) which are not
 +      tracked by Git remain untracked.  However, sometimes particular
 +      file(s) may have been tracked before adding them into the
 +      `.gitignore`, hence they still remain tracked.  To untrack and
 +      ignore files/patterns, use `git rm --cached <file/pattern>`
 +      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
  -----