diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-14 10:11:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-14 10:11:58 -0700 |
| commit | 7b1585b6902973456b47ee9acd8a01365e52a4df (patch) | |
| tree | db6fefbd5686265cb8e111e44cda82b6bde4df27 /git-checkout.html | |
| parent | 7c7cb3360bfca12cec5fa485344d786c4252d247 (diff) | |
| download | git-htmldocs-7b1585b6902973456b47ee9acd8a01365e52a4df.tar.gz | |
Autogenerated HTML docs for v2.33.1-637-gf443b
Diffstat (limited to 'git-checkout.html')
| -rw-r--r-- | git-checkout.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-checkout.html b/git-checkout.html index 308818576..db285b12d 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -907,8 +907,9 @@ file can be discarded to re-create the original conflicted merge result.</p></di <dd>
<p>
When switching branches, proceed even if the index or the
- working tree differs from <code>HEAD</code>. This is used to throw away
- local changes.
+ working tree differs from <code>HEAD</code>, and even if there are untracked
+ files in the way. This is used to throw away local changes and
+ any untracked files or directories that are in the way.
</p>
<div class="paragraph"><p>When checking out paths from the index, do not fail upon unmerged
entries; instead, unmerged entries are ignored.</p></div>
@@ -1560,7 +1561,7 @@ $ git add frotz</code></pre> <div id="footer">
<div id="footer-text">
Last updated
- 2020-11-01 22:43:13 PST
+ 2021-10-14 10:10:01 PDT
</div>
</div>
</body>
|