Re: [PATCH] read-tree.txt: clarify --reset and worktree changes
- Date: Mon, 01 Apr 2019 19:47:20 +0900
- From: Junio C Hamano <gitster@xxxxxxxxx>
- Subject: Re: [PATCH] read-tree.txt: clarify --reset and worktree changes
Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> writes:
> diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
> index 5c70bc2878..12a25bc954 100644
> --- a/Documentation/git-read-tree.txt
> +++ b/Documentation/git-read-tree.txt
> @@ -38,8 +38,9 @@ OPTIONS
> - Same as -m, except that unmerged entries are discarded
> - instead of failing.
> + Same as -m, except that unmerged entries are discarded
> + instead of failing. If `-u` is used, updates leading to loss
> + of local changes will not abort the operation.
"git add $file" makes a local change to the index at path $file",
and reverting that local change is what "read-tree --reset"
The difference cased by presence or lack of "-u" is only about the
working tree files, so s/local/working tree/ perhaps?
I'd also phrase s/If `-u` is used/When used with `-u`/ if I were
> After a successful merge, update the files in the work