From: Oleg Broytman <phd@phdru.name>
Date: Tue, 2 Jun 2015 18:08:18 +0000 (+0300)
Subject: Reorder some sections
X-Git-Url: https://git.phdru.name/?p=git-wiki.git;a=commitdiff_plain;h=d4c26d6596de1933139128e45c2514afb5540acb

Reorder some sections
---

diff --git a/pep-git.txt b/pep-git.txt
index 9c07758..46b7053 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -343,15 +343,6 @@ Staging area aka index is a distinguishing feature of git. See
 Wiki.
 
 
-Advanced configuration
-======================
-
-Line endings
-------------
-
-Git has builtin mechanisms to handle line endings.
-
-TODO: describe crlf configuration and .gitattributes.
 Merge or rebase?
 ================
 
@@ -368,6 +359,19 @@ Git has a builtin strategy for what Python core developers call
 ReReRe
 ======
 
+https://git-scm.com/book/en/Git-Tools-Rerere
+
+
+Advanced configuration
+======================
+
+Line endings
+------------
+
+Git has builtin mechanisms to handle line endings.
+
+TODO: describe crlf configuration and .gitattributes.
+
 
 Database maintenance
 ====================