diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:19 -0700 |
| commit | 94afbbb8de3d6a80602e7e27d559d2bdeffb0be4 (patch) | |
| tree | 5450b8fad987d30af7862a62e37e7c8ad9dca12a /Documentation/gitfaq.txt | |
| parent | Merge branch 'ss/faq-ignore' (diff) | |
| parent | gitfaq: fetching and pulling a repository (diff) | |
| download | git-94afbbb8de3d6a80602e7e27d559d2bdeffb0be4.tar.gz git-94afbbb8de3d6a80602e7e27d559d2bdeffb0be4.zip | |
Merge branch 'ss/faq-fetch-pull'
Random bits of FAQ.
* ss/faq-fetch-pull:
gitfaq: fetching and pulling a repository
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 11d9bac859..370d62dae4 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 ----- |