kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sn/reset-doc-typofix' 

Doc update.

* sn/reset-doc-typofix:
  doc: git-reset: fix a trivial typo
maint
Junio C Hamano 2017-06-24 14:28:39 -07:00
parent f3c9c8501d 680b469e83
commit 9bca0e5513
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-reset.txt
View File

@ -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 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 when you run "git diff", because you plan to work on other files
and changes with these files are distracting. 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 <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 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 to make does not affect frotz.c or filfre.c, so you revert the