From 17445a20f497bbce757285969e0f78f9b2c3cf1c Mon Sep 17 00:00:00 2001
From: Christian Krause <christian.krause@idiv.de>
Date: Thu, 11 Oct 2018 11:12:59 +0200
Subject: [PATCH] splits setup in two parts
one slide dedicated to editors
---
basics.html | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/basics.html b/basics.html
index c287e89..84f3199 100644
--- a/basics.html
+++ b/basics.html
@@ -344,8 +344,8 @@
```
</section>
- <section id="setup-git" data-markdown>
- ## git setup
+ <section id="setup-git-1" data-markdown>
+ ## git setup #1
```bash
# configure your identity
@@ -355,17 +355,29 @@
# show colors
git config --global color.ui auto
- # editor
- git config --global core.editor emacs
-
# configure aliases
git config --global alias.unstage 'reset HEAD --'
git config --global alias.lol \
'log --graph --decorate --oneline --all'
```
+ </section>
+
+ <section id="setup-git-2" data-markdown>
+ ## git setup #2
+
+ ```bash
+ # editor
+ git config --global core.editor emacs
+
+ # WINDOWS ONLY: let git handle line endings
+ git config --global core.autocrlf true
+ ```
notes:
- - editor: talk about line endings
+ - talk about line endings
+ - maintainers may reject contributions because of line endings
+ - difference between git config and editor config
+ - you can have fine grained control over this with gitattributes(5)
</section>
</section>
--
GitLab