development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nd/read-tree-reset-doc'

Browse source 
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:
Junio C Hamano 2019-04-22 11:14:47 +09:00
parent 8a33ebc551 b5a0bd694c
commit 87e20f8c4f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/git-read-tree.txt
View file

@ -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