X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=pep-git.txt;h=6272b08f8042abdc30a7b49171fa6e100286a869;hb=a958d8c8fcf792a478eecd22aacb09ee6f0b380e;hp=5f1c1c918bbf7f603f1ee171c212f31cf61eb411;hpb=6cb1d97f59fdcb29ec870b23712ef3b389cd5514;p=git-wiki.git

diff --git a/pep-git.txt b/pep-git.txt
index 5f1c1c9..6272b08 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...
@@ -490,6 +491,7 @@ Database maintenance
 ====================
 
 TODO: dangling objects, git gc, git repack.
+https://gcc.gnu.org/ml/gcc/2007-12/msg00165.html
 
 
 Tips and tricks