From 5f15a259381c382c768786b7ab2117f600a92854 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Tue, 2 Jun 2015 21:07:48 +0300 Subject: [PATCH] Add section "Merge or rebase?" --- pep-git.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pep-git.txt b/pep-git.txt index 2d9b20c..9c07758 100644 --- 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 -- 2.39.5