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.html | |
| parent | 2b43cff1c1e6418402997ad8a78ff0a401a5957a (diff) | |
| download | git-htmldocs-306e76339fb038ce03be6ebac180746c67e83fe8.tar.gz | |
Autogenerated HTML docs for v2.27.0-rc0
Diffstat (limited to 'gitfaq.html')
| -rw-r--r-- | gitfaq.html | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/gitfaq.html b/gitfaq.html index 32146b539..ac8a98fe6 100644 --- a/gitfaq.html +++ b/gitfaq.html @@ -1006,11 +1006,37 @@ 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.</p></div>
</dd>
+<dt class="hdlist1">
+I asked Git to ignore various files, yet they are still tracked
+</dt>
+<dd>
+<p>
+ A <code>gitignore</code> 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
+ <code>.gitignore</code>, hence they still remain tracked. To untrack and
+ ignore files/patterns, use <code>git rm --cached <file/pattern></code>
+ and add a pattern to <code>.gitignore</code> that matches the <file>.
+ See <a href="gitignore.html">gitignore(5)</a> for details.
+</p>
+</dd>
+<dt class="hdlist1">
+How do I know if I want to do a fetch or a pull?
+</dt>
+<dd>
+<p>
+ 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 <a href="git-pull.html">git-pull(1)</a>.
+</p>
+</dd>
</dl></div>
</div>
</div>
<div class="sect1">
-<h2 id="_hooks">Hooks</h2>
+<h2 id="fetching-and-pulling">Hooks</h2>
<div class="sectionbody">
<div class="dlist" id="restrict-with-hooks"><dl>
<dt class="hdlist1">
@@ -1142,7 +1168,7 @@ platform.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-04-22 14:37:28 PDT
+ 2020-05-14 16:00:38 PDT
</div>
</div>
</body>
|