diff options
| author |  Shourya Shukla <shouryashukla.oo@gmail.com> | 2020-05-06 22:41:10 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-05-06 13:38:37 -0700 |
| commit | f4d7bccdb40b33792b6c22f60bbed92eef8aecf8 (patch) | |
| tree | ab9f52c3d680772c37e16cf85fa3fe799037db9a | |
| parent | The seventh batch (diff) | |
| download | tgif-f4d7bccdb40b33792b6c22f60bbed92eef8aecf8.tar.xz | |
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>
| -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 1cf83df118..1846d90f94 100644 --- 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 ----- |