summaryrefslogtreecommitdiff
path: root/Documentation/git-reset.txt
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-03-31 22:11:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-31 22:16:22 (GMT)
commita58088abe2011b6f486de8acd54432f6d9bcecfc (patch)
treefdae618dee73d4a349c80321896d4f4a58344c35 /Documentation/git-reset.txt
parentcee0c2750bb5f1b38f15ef961517e03c2e39c9ec (diff)
downloadgit-a58088abe2011b6f486de8acd54432f6d9bcecfc.zip
git-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.gz
git-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.bz2
Documentation: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-reset.txt')
-rw-r--r--Documentation/git-reset.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index f445cb3..24bf4d5 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -21,7 +21,7 @@ to HEAD in all forms.
'git reset' [-q] [<tree-ish>] [--] <paths>...::
This form resets the index entries for all <paths> to their
- state at <tree-ish>. (It does not affect the working tree, nor
+ state at <tree-ish>. (It does not affect the working tree or
the current branch.)
+
This means that `git reset <paths>` is the opposite of `git add
@@ -51,7 +51,7 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
+
--
--soft::
- Does not touch the index file nor the working tree at all (but
+ Does not touch the index file or the working tree at all (but
resets the head to <commit>, just like all modes do). This leaves
all your changed files "Changes to be committed", as 'git status'
would put it.
@@ -115,7 +115,7 @@ and changes with these files are distracting.
<2> Somebody asks you to pull, and the changes sounds 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 nor filfre.c, so you revert the
+to make does not affect frotz.c or filfre.c, so you revert the
index changes for these two files. Your changes in working tree
remain there.
<4> Then you can pull and merge, leaving frotz.c and filfre.c