From a1cb43f3effc4de4d270f8cca881cbf8f3ddc064 Mon Sep 17 00:00:00 2001
From: Adam Voss <vossad01@gmail.com>
Date: Fri, 17 Feb 2017 10:19:35 -0600
Subject: [PATCH] Introduce end-of-line normalization

This will prevent diff issues such as the one seen in merge request 11 when an editor changed the EOL for a file resulting in a useless diff.
---
 .gitattributes                               |  5 ++
 _posts/2016-03-24-welcome-to-jekyll.markdown | 50 ++++++++++----------
 2 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..1fecb68
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
diff --git a/_posts/2016-03-24-welcome-to-jekyll.markdown b/_posts/2016-03-24-welcome-to-jekyll.markdown
index 5dbd875..b61d2cc 100644
--- a/_posts/2016-03-24-welcome-to-jekyll.markdown
+++ b/_posts/2016-03-24-welcome-to-jekyll.markdown
@@ -1,25 +1,25 @@
----
-layout: post
-title:  "Welcome to Jekyll!"
-date:   2016-03-24 15:32:14 -0300
-categories: jekyll update
----
-You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
-
-To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
-
-Jekyll also offers powerful support for code snippets:
-
-{% highlight ruby %}
-def print_hi(name)
-  puts "Hi, #{name}"
-end
-print_hi('Tom')
-#=> prints 'Hi, Tom' to STDOUT.
-{% endhighlight %}
-
-Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].
-
-[jekyll-docs]: http://jekyllrb.com/docs/home
-[jekyll-gh]:   https://github.com/jekyll/jekyll
-[jekyll-talk]: https://talk.jekyllrb.com/
+---
+layout: post
+title:  "Welcome to Jekyll!"
+date:   2016-03-24 15:32:14 -0300
+categories: jekyll update
+---
+You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
+
+To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
+
+Jekyll also offers powerful support for code snippets:
+
+{% highlight ruby %}
+def print_hi(name)
+  puts "Hi, #{name}"
+end
+print_hi('Tom')
+#=> prints 'Hi, Tom' to STDOUT.
+{% endhighlight %}
+
+Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].
+
+[jekyll-docs]: http://jekyllrb.com/docs/home
+[jekyll-gh]:   https://github.com/jekyll/jekyll
+[jekyll-talk]: https://talk.jekyllrb.com/
-- 
GitLab