From: Oleg Broytman <phd@phdru.name>
Date: Tue, 28 Jun 2016 16:08:10 +0000 (+0300)
Subject: Don't mention the author of the PEP
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=9f770b7460201b720340528999ecbe347a06601d;p=git-wiki.git

Don't mention the author of the PEP

He is humble and shy. ;-)
---

diff --git a/pep-103.txt b/pep-103.txt
index e953e07..ab2c351 100644
--- a/pep-103.txt
+++ b/pep-103.txt
@@ -592,10 +592,10 @@ that it is very much recommended not to rebase published commits the
 question's diminished even further: "whether to use rebase on
 non-pushed commits?"
 
-That small question is for the team to decide. The author of the PEP
-recommends to use rebase when pulling, i.e. always do ``git pull
---rebase`` or even configure automatic setup of rebase for every new
-branch::
+That small question is for the team to decide. To preserve the beauty
+of linear history it's recommended to use rebase when pulling, i.e. do
+``git pull --rebase`` or even configure automatic setup of rebase for
+every new branch::
 
     $ git config branch.autosetuprebase always