diff options
| author | Elijah Newren <newren@gmail.com> | 2021-09-27 19:33:48 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-27 23:38:37 +0300 |
| commit | 0e29222e0c2f68118cdd3412515539b74433b732 (patch) | |
| tree | cb22169e9bf6a07eb319409f74c1c15825f3e6cf /Documentation/git-read-tree.txt | |
| parent | 94b7f1563ace91af823125e5b8895cb24b2c0e4a (diff) | |
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>
Diffstat (limited to 'Documentation/git-read-tree.txt')
| -rw-r--r-- | Documentation/git-read-tree.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 0222a27c5a..8c3aceb832 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -38,8 +38,9 @@ OPTIONS --reset:: Same as -m, except that unmerged entries are discarded instead - of failing. When used with `-u`, updates leading to loss of - working tree changes will not abort the operation. + of failing. When used with `-u`, updates leading to loss of + working tree changes or untracked files or directories will not + abort the operation. -u:: After a successful merge, update the files in the work |