From: Oleg Broytman <phd@phdru.name>
Date: Fri, 26 Jun 2015 21:56:33 +0000 (+0300)
Subject: Fix autosetuprebase argument
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=ad6b3de1dd577b4871f333a6be868c35466e81a0;p=git-wiki.git

Fix autosetuprebase argument
---

diff --git a/pep-git.txt b/pep-git.txt
index 7ac3fb8..a96594d 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -435,7 +435,7 @@ recommends to use rebase when pulling, i.e. always do ``git pull
 --rebase`` or even configure automatic setup of rebase for every new
 branch::
 
-    $ git config branch.autosetuprebase true
+    $ git config branch.autosetuprebase always
 
 and configure rebase for existing branches::