mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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
This commit is contained in:
commit
87e20f8c4f
|
@ -38,8 +38,9 @@ OPTIONS
|
|||
started.
|
||||
|
||||
--reset::
|
||||
Same as -m, except that unmerged entries are discarded
|
||||
instead of failing.
|
||||
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.
|
||||
|
||||
-u::
|
||||
After a successful merge, update the files in the work
|
||||
|
|
Loading…
Reference in a new issue