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.txt | |
| parent | 7c7cb3360bfca12cec5fa485344d786c4252d247 (diff) | |
| download | git-htmldocs-7b1585b6902973456b47ee9acd8a01365e52a4df.tar.gz | |
Autogenerated HTML docs for v2.33.1-637-gf443b
Diffstat (limited to 'git-checkout.txt')
| -rw-r--r-- | git-checkout.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index b1a6fe449..d473c9bf3 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -118,8 +118,9 @@ OPTIONS -f:: --force:: When switching branches, proceed even if the index or the - working tree differs from `HEAD`. This is used to throw away - local changes. + working tree differs from `HEAD`, 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. + When checking out paths from the index, do not fail upon unmerged entries; instead, unmerged entries are ignored. |