From: Oleg Broytman Date: Tue, 30 Jun 2015 09:58:23 +0000 (+0300) Subject: Reorder sections X-Git-Url: https://git.phdru.name/?p=git-wiki.git;a=commitdiff_plain;h=ff0aeb35aaf670d3240e79de4c0fca72172a66d3 Reorder sections --- diff --git a/pep-git.txt b/pep-git.txt index 15ca892..d215a58 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -585,10 +585,15 @@ Git has a builtin merge strategy for what Python core developers call $ git merge -s ours v1 # null-merge v1 into v2 -ReReRe -====== +Advanced configuration +====================== -https://git-scm.com/book/en/Git-Tools-Rerere +Line endings +------------ + +Git has builtin mechanisms to handle line endings. + +TODO: describe crlf configuration and .gitattributes. Advanced topics @@ -605,15 +610,10 @@ Staging area aka index is a distinguishing feature of git. See Wiki. -Advanced configuration -====================== - -Line endings ------------- - -Git has builtin mechanisms to handle line endings. +ReReRe +====== -TODO: describe crlf configuration and .gitattributes. +https://git-scm.com/book/en/Git-Tools-Rerere Database maintenance