Documentation: call out commands that nuke untracked files/directories
Some commands have traditionally also removed untracked files (or directories) that were in the way of a tracked file we needed. Document these cases. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
94b7f1563a
commit
0e29222e0c
|
@ -118,8 +118,9 @@ OPTIONS
|
||||||
-f::
|
-f::
|
||||||
--force::
|
--force::
|
||||||
When switching branches, proceed even if the index or the
|
When switching branches, proceed even if the index or the
|
||||||
working tree differs from `HEAD`. This is used to throw away
|
working tree differs from `HEAD`, and even if there are untracked
|
||||||
local changes.
|
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
|
When checking out paths from the index, do not fail upon unmerged
|
||||||
entries; instead, unmerged entries are ignored.
|
entries; instead, unmerged entries are ignored.
|
||||||
|
|
|
@ -38,8 +38,9 @@ OPTIONS
|
||||||
|
|
||||||
--reset::
|
--reset::
|
||||||
Same as -m, except that unmerged entries are discarded instead
|
Same as -m, except that unmerged entries are discarded instead
|
||||||
of failing. When used with `-u`, updates leading to loss of
|
of failing. When used with `-u`, updates leading to loss of
|
||||||
working tree changes will not abort the operation.
|
working tree changes or untracked files or directories will not
|
||||||
|
abort the operation.
|
||||||
|
|
||||||
-u::
|
-u::
|
||||||
After a successful merge, update the files in the work
|
After a successful merge, update the files in the work
|
||||||
|
|
|
@ -69,7 +69,8 @@ linkgit:git-add[1]).
|
||||||
|
|
||||||
--hard::
|
--hard::
|
||||||
Resets the index and working tree. Any changes to tracked files in the
|
Resets the index and working tree. Any changes to tracked files in the
|
||||||
working tree since `<commit>` are discarded.
|
working tree since `<commit>` are discarded. Any untracked files or
|
||||||
|
directories in the way of writing any tracked files are simply deleted.
|
||||||
|
|
||||||
--merge::
|
--merge::
|
||||||
Resets the index and updates the files in the working tree that are
|
Resets the index and updates the files in the working tree that are
|
||||||
|
|
Loading…
Reference in New Issue