X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=fcdfc633980e8d538bcdc2cf21273e8782ae17fa;hb=6236c4807648a130f54fb2f01fc458e80b274d47;hp=a16cbea7d599442852548d897fec4285267d6ccf;hpb=2b392590f62e034ad9d49c6a7ebf51862ef8ba8d;p=git-wiki.git

diff --git a/pep-git.txt b/pep-git.txt
index a16cbea..fcdfc63 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -142,9 +142,9 @@ Branches and branches
 Git terminology can be a bit misleading. Take, for example, the term
 "branch". In git it has two meanings. A branch is a directed line of
 commits (possibly with merges). And a branch is a label or a pointer
-assigned to a line of commits. It is important to differentiate when
-you talk about commits and when about their labels. Lines of commits
-are by itself unnamed and are usually only lengthening and merging.
+assigned to a line of commits. It is important to distinguish when you
+talk about commits and when about their labels. Lines of commits are
+by itself unnamed and are usually only lengthening and merging.
 Labels, on the other hand, can be created, moved, renamed and deleted
 freely.
 
@@ -347,7 +347,8 @@ pushed). To push tags list them explicitly::
     $ git push origin tag 1.4.2
     $ git push origin v1 v2 tag 2.1.7
 
-Don't move tags with ``git tag -f`` after they have been published.
+Don't move tags with ``git tag -f`` or remove tags with ``git tag -d``
+after they have been published.
 
 
 Commit editing and caveats
@@ -402,7 +403,7 @@ file(s) to that one of a commit. Like this::
     git checkout HEAD~ README
 
 The commands restores the contents of README file to the last but one
-commit in the current branch. By default a commit ID is simple HEAD;
+commit in the current branch. By default a commit ID is simply HEAD;
 i.e. ``git checkout README`` restores README to the latest commit.
 
 (Do not use ``git checkout`` to view a content of a file in a commit,
@@ -411,7 +412,7 @@ use ``git cat-file -p``; e.g. ``git cat-file -p HEAD~:path/to/README``).
 ``git reset`` moves the head of the current branch. The head can be
 moved to point to any commit but it's often used to remove a commit or
 a few (preferably, non-pushed ones) from the top of the branch - that
-is, to move the branch backward in order to undo a few non-pushed
+is, to move the branch backward in order to undo a few (non-pushed)
 commits.
 
 ``git reset`` has three modes of operation - soft, hard and mixed.