Skip to content

Commit 87e20f8

Browse files
committed
Merge branch 'nd/read-tree-reset-doc'
The documentation for "git read-tree --reset -u" has been updated. * nd/read-tree-reset-doc: read-tree.txt: clarify --reset and worktree changes
2 parents 8a33ebc + b5a0bd6 commit 87e20f8

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Documentation/git-read-tree.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ OPTIONS
3838
started.
3939

4040
--reset::
41-
Same as -m, except that unmerged entries are discarded
42-
instead of failing.
41+
Same as -m, except that unmerged entries are discarded instead
42+
of failing. When used with `-u`, updates leading to loss of
43+
working tree changes will not abort the operation.
4344

4445
-u::
4546
After a successful merge, update the files in the work

0 commit comments

Comments
 (0)