Add section "Merge or rebase?"

diff --git a/pep-git.txt b/pep-git.txt
index 2d9b20c588cfe628fb11c09a7b2e6edb4ca1702b..9c07758a32ab236e6c6dbcf2cb90eb63ca076448 100644 (file)
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -352,6 +352,8 @@ Line endings
 Git has builtin mechanisms to handle line endings.
 
 TODO: describe crlf configuration and .gitattributes.
+Merge or rebase?
+================
 
 
 Null-merges