From 9f770b7460201b720340528999ecbe347a06601d Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Tue, 28 Jun 2016 19:08:10 +0300 Subject: [PATCH] Don't mention the author of the PEP He is humble and shy. ;-) --- pep-103.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 -- 2.39.2