From f2e0f7cc737b63161b3ed980239e444bc2df39b1 Mon Sep 17 00:00:00 2001
From: Kevin Ross <kevin.ross@alienfast.com>
Date: Tue, 26 Jan 2016 12:17:06 -0600
Subject: [PATCH] Sooo, we learned that buildcontrol wipes your branch out, so
 let's go ahead and keep dist separate.

---
 .gitignore   | 3 +++
 Gruntfile.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f8c548e1..39931812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 
+# Ignore dist as buildcontrol will place it on it's own branch
+dist
+
 # Ignore docs dist files
 docs/dist/**/*
 docs/assets/css/*
diff --git a/Gruntfile.js b/Gruntfile.js
index 1cd844ed..348c5b4f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -482,7 +482,7 @@ module.exports = function (grunt) {
       dist: {
         options: {
           dir: 'dist',
-          branch: 'v4-dev', // FIXME: this needs to be master branch eventually!
+          branch: 'dist',
           message: 'dist from commit %sourceCommit% on branch %sourceBranch%'
         }
       }