X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=pep-git.txt;h=1295dbb394f0ebf341cf2971e79ecc67078ad267;hb=57c580734c27c40e347bef375a8cc01f13b0e5d8;hp=2d9b20c588cfe628fb11c09a7b2e6edb4ca1702b;hpb=a97db2d494d3981d34507f5d04e7b3cc15bdb682;p=git-wiki.git
diff --git a/pep-git.txt b/pep-git.txt
index 2d9b20c..1295dbb 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -75,7 +75,7 @@ Download and installation
Unix users: download and install using your package manager.
Microsoft Windows: download `git-for-windows
-`_.
+`_.
MacOS X: use git installed with `XCode
`_ or download
@@ -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
-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"
@@ -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.
-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 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
::
@@ -281,7 +290,7 @@ Commit editing and caveats
==========================
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.
@@ -343,15 +352,8 @@ Staging area aka index is a distinguishing feature of git. See
Wiki.
-Advanced configuration
-======================
-
-Line endings
-------------
-
-Git has builtin mechanisms to handle line endings.
-
-TODO: describe crlf configuration and .gitattributes.
+Merge or rebase?
+================
Null-merges
@@ -366,6 +368,19 @@ Git has a builtin strategy for what Python core developers call
ReReRe
======
+https://git-scm.com/book/en/Git-Tools-Rerere
+
+
+Advanced configuration
+======================
+
+Line endings
+------------
+
+Git has builtin mechanisms to handle line endings.
+
+TODO: describe crlf configuration and .gitattributes.
+
Database maintenance
====================