Change wording and spelling

[git-wiki.git] / pep-git.txt

diff --git a/pep-git.txt b/pep-git.txt
index 46b70537695ffa02a56352287cc4c3329b3a6222..e0425be37dd93061e77a7da85d9df2c7d15aaaf6 100644 (file)
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -87,7 +87,7 @@ Initial configuration
 
 This simple code is often appears in documentation, but it is
 important so let repeat it here. Git marks every commit with author
 
 This simple code is often appears in documentation, but it is
 important so let repeat it here. Git marks every commit with author

-and commiter names/emails, so configure your real name and preferred
+and committer names/emails, so configure your real name and preferred

 email::
 
     $ git config --global user.name "User Name"
 email::
 
     $ git config --global user.name "User Name"


@@ -185,7 +185,7 @@ branch BRANCH and its upstream remote branch. But it refuses to update
 branches in case of non-fast-forward. And it refuses to update the
 current branch.
 
 branches in case of non-fast-forward. And it refuses to update the
 current branch.
 

-The first command is used internall by ``git pull``.
+The first command is used internally by ``git pull``.

 
 ::
 
 
 ::
 


@@ -236,8 +236,17 @@ git guesses (knowing upstream remote branches) that you really want
 
     $ git push origin v1:v1 v2:v2
 
 
     $ git push origin v1:v1 v2:v2
 

-Git pushes commits to the remote repo and updates remote branches. It
-is possible to configure git to make it push a few branches or all
+Git pushes commits to the remote repo and updates remote branches. Git
+refuses to push commits that aren't fast-forwardable. You can
+force-push anyway, but please remember - you can force-push to your
+own repositories but don't force-push to public or shared repos. If
+you find git refuses to push commits that aren't fast-forwardable,
+better fetch and merge commits from the remote repo (or rebase your
+commits on top of the fetched commits), then push. Only force-push if
+you know what you do and why you do it. See the section `Commit
+editing and caveats`_ below.
+
+It is possible to configure git to make it push a few branches or all

 branches at once, so you can simply run
 
 ::
 branches at once, so you can simply run
 
 ::


@@ -281,7 +290,7 @@ Commit editing and caveats
 ==========================
 
 A warning not to edit published (pushed) commits also appears in
 ==========================
 
 A warning not to edit published (pushed) commits also appears in

-documentation but it's also repeated here as it's very important.
+documentation but it's repeated here anyway as it's very important.

 
 It is possible to recover from forced push but it's PITA for the
 entire team. Please avoid it.
 
 It is possible to recover from forced push but it's PITA for the
 entire team. Please avoid it.