From: Denton Liu <liu.denton@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH] git-reset.txt: clarify documentation
Date: Tue, 5 Mar 2019 10:54:23 -0800 [thread overview]
Message-ID: <20190305185423.GA22260@dev-l> (raw)
git-reset.txt contained a missing "a" and "wrt". Fix the missing "a" for
correctness and replace "wrt" with "with respect to" so that the
documentation is not so cryptic.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
Documentation/git-reset.txt | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 132f8e55f6..dbf4e567a2 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -428,11 +428,11 @@ working index HEAD target working index HEAD
`reset --merge` is meant to be used when resetting out of a conflicted
merge. Any mergy operation guarantees that the working tree file that is
-involved in the merge does not have local change wrt the index before
-it starts, and that it writes the result out to the working tree. So if
-we see some difference between the index and the target and also
-between the index and the working tree, then it means that we are not
-resetting out from a state that a mergy operation left after failing
+involved in the merge does not have a local change with respect to the
+index before it starts, and that it writes the result out to the working
+tree. So if we see some difference between the index and the target and
+also between the index and the working tree, then it means that we are
+not resetting out from a state that a mergy operation left after failing
with a conflict. That is why we disallow `--merge` option in this case.
`reset --keep` is meant to be used when removing some of the last
--
2.21.0.260.g8f7229c82f
next reply other threads:[~2019-03-05 18:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-05 18:54 Denton Liu [this message]
2019-03-05 22:30 ` [PATCH] git-reset.txt: clarify documentation Junio C Hamano
2019-03-05 22:37 ` Denton Liu
2019-03-05 22:49 ` Junio C Hamano
2019-03-05 23:34 ` [PATCH v2] " Denton Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190305185423.GA22260@dev-l \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.