Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
doc: git-reset: fix a trivial typo
author
Štěpán Němec
<stepnem@gmail.com>
Wed, 14 Jun 2017 09:36:58 +0000
(11:36 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Jun 2017 20:42:58 +0000
(13:42 -0700)
Signed-off-by: Štěpán Němec <stepnem@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-reset.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
fd99e2b
)
diff --git
a/Documentation/git-reset.txt
b/Documentation/git-reset.txt
index 8a21198d65c77c4a23f95d089ed1ce7f003dc0c6..70f3753e1e90f74bb41e8a9ce90dcf7dc4420192 100644
(file)
--- 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.
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 sound
s
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
<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