diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 15:29:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 15:29:35 -0700 |
| commit | 8992def6b35350b401fd9935165dd7835c198771 (patch) | |
| tree | 89145becb17bacd4b30e00454cfc6d613aabd45a | |
| parent | 74567ac0018247cbe08a5c1a1b1176a51ec2e49e (diff) | |
| parent | 680b469e83c23ea682786acb661ad3835f779fb8 (diff) | |
| download | git-8992def6b35350b401fd9935165dd7835c198771.tar.gz | |
Merge branch 'sn/reset-doc-typofix' into maint
Doc update.
* sn/reset-doc-typofix:
doc: git-reset: fix a trivial typo
| -rw-r--r-- | Documentation/git-reset.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 8a21198d65..70f3753e1e 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 |