From: Oleg Broytman <phd@phdru.name>
Date: Mon, 8 Jun 2015 22:24:36 +0000 (+0300)
Subject: Add an example and change wording
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=df380c17cca5f6a0ececaf1a737653d99ba38d9f;p=git-wiki.git

Add an example and change wording
---

diff --git a/pep-git.txt b/pep-git.txt
index 5f1c1c9..d6c4676 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -413,6 +413,7 @@ and configure rebase for existing branches::
 
 For example::
 
+    $ git config branch.v1.rebase true
     $ git config branch.v2.rebase true
 
 After that ``git pull origin v2`` becomes equivalent to ``git pull
@@ -421,10 +422,10 @@ After that ``git pull origin v2`` becomes equivalent to ``git pull
 In case when merge is preferred it is recommended to create new
 commits in a separate feature or topic branch while using rebase to
 update the mainline branch. When the topic branch is ready merge it
-into mainline. To avoid a tedious task of resolving conflicts you can
-merge the topic branch to the mainline from time to time and switch
-back to the topic branch to continue working on it. The entire
-workflow would be something like::
+into mainline. To avoid a tedious task of resolving large number of
+conflicts at once you can merge the topic branch to the mainline from
+time to time and switch back to the topic branch to continue working
+on it. The entire workflow would be something like::
 
     $ git checkout -b issue-42  # create and switch to a new branch
         ...edit/test/commit...