kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ss/faq-fetch-pull' 

Random bits of FAQ.

* ss/faq-fetch-pull:
  gitfaq: fetching and pulling a repository
maint
Junio C Hamano 2020-05-13 12:19:19 -07:00
parent 658624209a f4d7bccdb4
commit 94afbbb8de
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/gitfaq.txt
View File

@ -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>. and add a pattern to `.gitignore` that matches the <file>.
See linkgit:gitignore[5] for details. 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 Hooks
----- -----