Sooo, we learned that buildcontrol wipes your branch out, so let's go ahead and keep dist separate.

This commit is contained in:
Kevin Ross 2016-01-26 12:17:06 -06:00
parent ac37625123
commit f2e0f7cc73
2 changed files with 4 additions and 1 deletions

3
.gitignore vendored
View File

@ -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/*

View File

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