diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-14 16:03:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-14 16:03:19 -0700 |
| commit | 306e76339fb038ce03be6ebac180746c67e83fe8 (patch) | |
| tree | bc750056a598b1f350488282491fd8f8987774d1 /gitfaq.txt | |
| parent | 2b43cff1c1e6418402997ad8a78ff0a401a5957a (diff) | |
| download | git-htmldocs-306e76339fb038ce03be6ebac180746c67e83fe8.tar.gz | |
Autogenerated HTML docs for v2.27.0-rc0
Diffstat (limited to 'gitfaq.txt')
| -rw-r--r-- | gitfaq.txt | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/gitfaq.txt b/gitfaq.txt index 1cf83df11..370d62dae 100644 --- a/gitfaq.txt +++ b/gitfaq.txt @@ -223,6 +223,24 @@ 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. +[[files-in-.gitignore-are-tracked]] +I asked Git to ignore various files, yet they are still tracked:: + A `gitignore` file ensures that certain file(s) which are not + tracked by Git remain untracked. However, sometimes particular + file(s) may have been tracked before adding them into the + `.gitignore`, hence they still remain tracked. To untrack and + ignore files/patterns, use `git rm --cached <file/pattern>` + 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 ----- |