diff options
Diffstat (limited to 'Documentation/gitfaq.txt')
| -rw-r--r-- | Documentation/gitfaq.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt index a9ff16b66c..9cd7a592ac 100644 --- 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 ----- |