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%' } }