Skip to content

Commit f4d7bcc

Browse files
periperidipgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Shourya Shukla <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 07d8ea5 commit f4d7bcc

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Documentation/gitfaq.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,14 @@ a file checked into the repository which is a template or set of defaults which
223223
can then be copied alongside and modified as appropriate. This second, modified
224224
file is usually ignored to prevent accidentally committing it.
225225

226+
[[fetching-and-pulling]]
227+
How do I know if I want to do a fetch or a pull?::
228+
A fetch stores a copy of the latest changes from the remote
229+
repository, without modifying the working tree or current branch.
230+
You can then at your leisure inspect, merge, rebase on top of, or
231+
ignore the upstream changes. A pull consists of a fetch followed
232+
immediately by either a merge or rebase. See linkgit:git-pull[1].
233+
226234
Hooks
227235
-----
228236

0 commit comments

Comments
 (0)