From: Shourya Shukla Date: Wed, 6 May 2020 17:11:10 +0000 (+0530) Subject: gitfaq: fetching and pulling a repository X-Git-Tag: v2.27.0-rc0~17^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4d7bccdb40b33792b6c22f60bbed92eef8aecf8;p=thirdparty%2Fgit.git 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 Signed-off-by: Shourya Shukla Signed-off-by: Junio C Hamano --- 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 -----