summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-24 21:28:39 (GMT)
commit9bca0e5513579386384c064c5cdc45980b6774df (patch)
tree54107b2ce70a2cbb36d9871802712d322fef1dad
parentf3c9c8501d86de88f8ec88a6d520e7e3aea5cead (diff)
parent680b469e83c23ea682786acb661ad3835f779fb8 (diff)
downloadgit-9bca0e5513579386384c064c5cdc45980b6774df.zip
git-9bca0e5513579386384c064c5cdc45980b6774df.tar.gz
git-9bca0e5513579386384c064c5cdc45980b6774df.tar.bz2
Merge branch 'sn/reset-doc-typofix'
Doc update. * sn/reset-doc-typofix: doc: git-reset: fix a trivial typo
-rw-r--r--Documentation/git-reset.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 8a21198..70f3753 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -115,7 +115,7 @@ $ git pull git://info.example.com/ nitfol <4>
in these files are in good order. You do not want to see them
when you run "git diff", because you plan to work on other files
and changes with these files are distracting.
-<2> Somebody asks you to pull, and the changes sounds worthy of merging.
+<2> Somebody asks you to pull, and the changes sound worthy of merging.
<3> However, you already dirtied the index (i.e. your index does
not match the HEAD commit). But you know the pull you are going
to make does not affect frotz.c or filfre.c, so you revert the