Change wording

diff --git a/pep-git.txt b/pep-git.txt
index 25f6cfbcbc92cb8829f6bda87ab95b4c5c3d9835..f2ce4c151d60a78928bd3879afbe2ec018f952c8 100644 (file)
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -50,7 +50,7 @@ Advanced documentation
 
 `Git Magic
 <http://www-cs-students.stanford.edu/~blynn/gitmagic/index.html>`_,
-also with a number of translations.
+with a number of translations.
 
 `Pro Git <https://git-scm.com/book>`_. The Book about git. Buy it at
 Amazon or download in PDF, mobi, or ePub form. Has translations to
@@ -641,7 +641,7 @@ Staging area
 Staging area aka index aka cache is a distinguishing feature of git.
 Staging area is where git collects patches before committing them.
 Separation between collecting patches and commit phases provides a
-very useful feature of git: one can review collected patches before
+very useful feature of git: you can review collected patches before
 commit and even edit them - remove some hunks, add new hunks and
 review again.
 
@@ -678,8 +678,8 @@ Rerere is a mechanism that helps to resolve repeated merge conflicts.
 The most frequent source of recurring merge conflicts are topic
 branches that are merged into mainline and then the merge commits are
 removed; that's often performed to test the topic branches and train
-rerere; merge commits are removed to have clean history and finish a
-topic branch with only one last merge commit.
+rerere; merge commits are removed to have clean linear history and
+finish the topic branch with only one last merge commit.
 
 Rerere works by remembering the states of tree before and after a
 successful commit. That way rerere can automatically resolve conflicts
@@ -752,7 +752,7 @@ when it doesn't. E.g., ``git log -p -5`` cannot be combined as ``git
 log -p5``.
 
 Some options have arguments, some even have default arguments. In that
-case the argument for such option must be spelled in sticky way:
+case the argument for such option must be spelled in a sticky way:
 ``-Oarg``, never ``-O arg`` because for an option that has a default
 argument the latter means "use default value for option ``-O`` and
 pass ``arg`` further to the option parser". For example, ``git grep``
@@ -781,13 +781,13 @@ bash_completion package. If you want to upgrade your git completion to
 the latest and greatest download necessary file from `git contrib
 <https://git.kernel.org/cgit/git/git.git/tree/contrib/completion>`_.
 
-Git-for-windows comes with git-bash, bash completion is installed and
-enabled.
+Git-for-windows comes with git-bash for which bash completion is
+installed and enabled.
 
 bash/zsh prompt
 ---------------
 
-For shell command-line lovers prompt can carry a lot of useful
+For command-line lovers shell prompt can carry a lot of useful
 information. To include git information in the prompt use
 `git-prompt.sh
 <https://git.kernel.org/cgit/git/git.git/tree/contrib/completion/git-prompt.sh>`_.