diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-22 02:14:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-22 02:14:47 (GMT) |
| commit | 87e20f8c4ffe0c96b1c288057555aec81393da28 (patch) | |
| tree | b6a58293ea99d2a984cddd60462cd21c06d66cb5 /Documentation | |
| parent | 8a33ebc5518d4910715f35f031b3d221cf3030da (diff) | |
| parent | b5a0bd694c60338e68977c54a41470ce007b036f (diff) | |
| download | git-87e20f8c4ffe0c96b1c288057555aec81393da28.zip git-87e20f8c4ffe0c96b1c288057555aec81393da28.tar.gz git-87e20f8c4ffe0c96b1c288057555aec81393da28.tar.bz2 | |
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
Diffstat (limited to 'Documentation')
| -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 5c70bc2..7061d66 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -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 |