From: Oleg Broytman Date: Tue, 2 Jun 2015 18:07:48 +0000 (+0300) Subject: Add section "Merge or rebase?" X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=5f15a259381c382c768786b7ab2117f600a92854;p=git-wiki.git Add section "Merge or rebase?" --- 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