Reorder some sections

[git-wiki.git] / pep-git.txt

diff --git a/pep-git.txt b/pep-git.txt
index 2d9b20c588cfe628fb11c09a7b2e6edb4ca1702b..46b70537695ffa02a56352287cc4c3329b3a6222 100644 (file)
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -343,15 +343,8 @@ 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?
+================
 
 
 Null-merges
@@ -366,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
 ====================