Updates to the git config & git deploy script.

Author: jdrydn

.gitconfig

@@ -2,6 +2,7 @@
 	deploy = "!bash ~/.dotfiles/git-deploy.sh"
 [core]
 	editor = vim
+	autocrlf = input
 [push]
 	default = simple
 [user]

git-deploy.sh

@@ -51,7 +51,7 @@ esac
 
 git pull &&
 git checkout $DESTINATION_BRANCH &&
-git merge --no-ff $SOURCE_BRANCH -m "Deployment" &&
+git merge --no-ff $SOURCE_BRANCH -m "Merging develop into master for deployment." &&
 git push origin $DESTINATION_BRANCH &&
 git checkout $SOURCE_BRANCH
 
@@ -63,4 +63,4 @@ if [ "$?" != "0" ]; then
 	exit 5
 fi
 
-exit 0
+exit 0